Fix NPC teleporting

Maximum overkill, fixes 90% of bugs!