Add checking so that non-combat npcs cannot be attacked