diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-07-20 18:55:40 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-07-20 18:55:40 +0200 |
| commit | 8466894d816f484f30cdbe47b980a142870c955e (patch) | |
| tree | bbb66264042eb8db2d490f37bf8b412f514d68eb /src/server/game/Maps | |
| parent | 51d7ff6f0bb4a512ff3dc912f2574e3087014553 (diff) | |
Core/Maps: Replace some Instanceable() checks with IsDungeon()
Diffstat (limited to 'src/server/game/Maps')
| -rw-r--r-- | src/server/game/Maps/MapInstanced.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index 934a807394f..7bb6c9a8460 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -141,7 +141,7 @@ Map* MapInstanced::CreateInstanceForPlayer(uint32 mapId, Player* player, uint32 } } } - else if (!IsGarrison()) + else if (IsDungeon()) { InstancePlayerBind* pBind = player->GetBoundInstance(GetId(), player->GetDifficultyID(GetEntry())); InstanceSave* pSave = pBind ? pBind->save : nullptr; @@ -198,7 +198,7 @@ Map* MapInstanced::CreateInstanceForPlayer(uint32 mapId, Player* player, uint32 map = CreateInstance(newInstanceId, nullptr, diff, player->GetTeamId()); } } - else + else if (IsGarrison()) { newInstanceId = player->GetGUID().GetCounter(); map = FindInstanceMap(newInstanceId); diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index e59e0cea265..ae040530b3c 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -293,11 +293,10 @@ uint32 MapManager::GetNumInstances() for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) { Map* map = itr->second; - if (!map->Instanceable()) + if (!map->IsDungeon()) continue; MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps(); - for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) - if (mitr->second->IsDungeon()) ret++; + ret += maps.size(); } return ret; } @@ -310,12 +309,11 @@ uint32 MapManager::GetNumPlayersInInstances() for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) { Map* map = itr->second; - if (!map->Instanceable()) + if (!map->IsDungeon()) continue; MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps(); for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr) - if (mitr->second->IsDungeon()) - ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize(); + ret += mitr->second->GetPlayers().getSize(); } return ret; } |