npc bounding box no longer detaches from player

This was originally going to be designed to fix #1112, but having to choose between having the player overlap with the NPC or moving the player(to a possibly dangerous place) seemed unfair.

This pull request ensures that as a result of talking to an NPC your bounding box doesn't become separated from him/her.