Core/Maps: Properly re-create map on login for ephemeral player saves. Because it bugged me to no end when testing anything ever.

(cherry picked from commit dc86a8e5db549300f7cb7b2243654c105013f929)
2021-10-23 14:52:18 +02:00
parent 8760b7322e
commit fd930d4c83
1 changed files with 3 additions and 1 deletions
@@ -154,7 +154,9 @@ Map* MapInstanced::CreateInstanceForPlayer(uint32 mapId, Player* player, uint32
            if (loginInstanceId) // if the player has a saved instance id on login, we either use this instance or relocate him out (return null)
            {
                map = FindInstanceMap(loginInstanceId);
-                return (map && map->GetId() == GetId()) ? map : nullptr; // is this check necessary? or does MapInstanced only find instances of itself?
+                if (!map && pSave && pSave->GetInstanceId() == loginInstanceId)
+                    map = CreateInstance(loginInstanceId, pSave, pSave->GetDifficultyID(), player->GetTeamId());
+                return map;
            }

            InstanceGroupBind* groupBind = nullptr;