Tweaked Player switching and Entity carrying