Fix npc right-click bug