Fixed NPC Collision

Fixed NPC collision problems where the player was glued to the NPC