Move some NPC collision logic from Player into NPC