Move all npc code out of CombatTag.java