1 files changed, 5 insertions, 2 deletions

@@ -86,19 +86,22 @@ function SetPartyDirection(spriteId, direction)
 end
 
 function ChangeMap(map, warp)
-  local playerId = getControllableSprite()
+  local playerId = getPlayerSprite()
   local playerSprite = getSprite(playerId)
   local direction = playerSprite.dir
   local oldState = playerSprite.characterState
 
+  playerSprite.controllable = false
   FadeToBlack(150)
   loadMap("../res/maps/" .. map .. ".tmx", warp, direction)
 
-  local newPlayerId = getControllableSprite()
+  local newPlayerId = getPlayerSprite()
+  local newPlayerSprite = getSprite(newPlayerId)
   if oldState == CharacterState.RUNNING then
     character():startRunning(newPlayerId)
   end
 
   coroutine.yield()
   RemoveFadeout(150)
+  newPlayerSprite.controllable = true
 end