diff options
| author | 天鹿 <18535853+PkllonG@users.noreply.github.com> | 2025-03-04 05:12:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-03 22:12:54 +0100 |
| commit | 82bc814858c2f9f507bfa707fce1b2507d6afaed (patch) | |
| tree | 118f54a0b4322e3685a815991400e8a0e39d1422 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | a2a0bc51ab5e8c33a650a77b6098b1a6c5d3ff82 (diff) | |
fix(Core/PvP): Sometimes mobs and objects fail to spawn in OutdoorPvP (#21636)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index dede1dbed1..47cdd1cf7d 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2362,7 +2362,7 @@ void ObjectMgr::RemoveCreatureFromGrid(ObjectGuid::LowType guid, CreatureData co } } -uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay, float rotation0, float rotation1, float rotation2, float rotation3) +ObjectGuid::LowType ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay, float rotation0, float rotation1, float rotation2, float rotation3) { GameObjectTemplate const* goinfo = GetGameObjectTemplate(entry); if (!goinfo) @@ -2413,7 +2413,7 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float return spawnId; } -uint32 ObjectMgr::AddCreData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay) +ObjectGuid::LowType ObjectMgr::AddCreData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay) { CreatureTemplate const* cInfo = GetCreatureTemplate(entry); if (!cInfo) @@ -2454,7 +2454,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 mapId, float x, float y, float AddCreatureToGrid(spawnId, &data); // Spawn if necessary (loaded grids only) - if (!map->Instanceable() && !map->IsGridCreated(x, y)) + if (!map->Instanceable() && map->IsGridLoaded(x, y)) { Creature* creature = new Creature(); if (!creature->LoadCreatureFromDB(spawnId, map, true, true)) |