fixed melee combat bug