diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-02-27 16:18:08 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-08-08 21:21:34 +0200 |
| commit | 8757a80767a932ceea679e84881c7dd2f89322cb (patch) | |
| tree | 39e9979d6ccecf505010575acca2e7bd4e18574e /src | |
| parent | d2878d47c9e80d45d84cc12aa3445db4920fee74 (diff) | |
Core/Creature: Add another aggressive compatibility mode assertion to catch faulty dynspawn code.
(cherry picked from commit 3eab2d7efcc225696fe32f94687fd8e7b6755a2a)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 3c98d58eba2..13c80e7f11d 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1775,7 +1775,6 @@ bool Creature::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, m_respawnTime = GetMap()->GetCreatureRespawnTime(m_spawnId); - // Is the creature script objecting to us spawning? If yes, delay by a little bit (then re-check in ::Update) if (!m_respawnTime && !map->IsSpawnGroupActive(data->spawnGroupData->groupId)) { ASSERT(m_respawnCompatibilityMode, "Creature (SpawnID " UI64FMTD ") trying to load in inactive spawn group %s.", spawnId, data->spawnGroupData->name.c_str()); @@ -1784,6 +1783,7 @@ bool Creature::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, if (m_respawnTime) // respawn on Update { + ASSERT(m_respawnCompatibilityMode, "Creature (SpawnID " UI64FMTD ") trying to load despite a respawn timer in progress.", spawnId); m_deathState = DEAD; if (CanFly()) { |