diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-07-18 00:57:16 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-07-18 00:57:16 +0200 |
| commit | 4c173e4b7b35161fcaaa4917da8fde2e4f3cbdd8 (patch) | |
| tree | 361de2f13c3ebac3bd853789e9254f825f57a7e3 /src/server/game/Events/GameEventMgr.cpp | |
| parent | c56d0a092fa5732d5131713e355ae850d672e090 (diff) | |
Core/Maps: Use FindMap instead of CreateBaseMap in places where the intent was to check for a existing map (and a loaded grid on that map)
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 2084cb43e2e..9516c566ce9 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1215,9 +1215,9 @@ void GameEventMgr::GameEventSpawn(int16 event_id) sObjectMgr->AddCreatureToGrid(*itr, data); // Spawn if necessary (loaded grids only) - Map* map = sMapMgr->CreateBaseMap(data->mapid); + Map* map = sMapMgr->FindMap(data->mapid, 0); // We use spawn coords to spawn - if (!map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) + if (map && !map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) Creature::CreateCreatureFromDB(*itr, map); } } @@ -1237,9 +1237,9 @@ void GameEventMgr::GameEventSpawn(int16 event_id) sObjectMgr->AddGameobjectToGrid(*itr, data); // Spawn if necessary (loaded grids only) // this base map checked as non-instanced and then only existed - Map* map = sMapMgr->CreateBaseMap(data->mapid); + Map* map = sMapMgr->FindMap(data->mapid, 0); // We use current coords to unspawn, not spawn coords since creature can have changed grid - if (!map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) + if (map && !map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) { if (GameObject* go = GameObject::CreateGameObjectFromDB(*itr, map, false)) { |