Watch Your Plastic Duck: Fix combat mode crash (v1.2.4)

At least it should be more stable