1 files changed, 7 insertions, 1 deletions

@@ -260,7 +260,13 @@ function ChangeMap(map, warp, options)
     FadeToBlack(150)
   end
   loadMap(map)
-  character():transplantParty(playerId, getWarpPoint(warp), direction)
+  character():transplantParty(playerId, getMap():getWarpPoint(warp), direction)
+
+  if (mixer():isPlayingMusic() and not getMap():hasMusic()) then
+    mixer():fadeoutMusic(150)
+  elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not mixer():getPlayingTrack() == getMap():getMusic())) then
+    mixer():playMusic(getMap():getMusic(), 150)
+  end
 
   coroutine.yield()
   if (options & ChangeMapOptions.DO_NOT_FADE == 0) then