fixed broken combat.