Improve NPC aggro code