Fix from Aidil for a runtime error in combat.