Fix issue with CombatTag NPC errors. Fixes #1012

NOTE: Do NOT change the default NPC name for CombatTag in your config,
or this fix won't work.
The previous CombatTag fix should take care of these.