Try to clean up our poor EntityListener...
Try to clean CombatUtils a bit...