diff options
author | Treeston <treeston.mmoc@gmail.com> | 2018-02-27 16:18:08 +0100 |
---|---|---|
committer | Treeston <treeston.mmoc@gmail.com> | 2018-02-27 16:18:38 +0100 |
commit | 3eab2d7efcc225696fe32f94687fd8e7b6755a2a (patch) | |
tree | 031adb3cdc0103f5abc9ec2930552750b36d942f /src | |
parent | c9b730c767072225fdc2142908455c1d26e91fa8 (diff) |
Core/Creature: Add another aggressive compatibility mode assertion to catch faulty dynspawn code.
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 60bac60f45d..9d6ca8097f7 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1633,7 +1633,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 %u) trying to load in inactive spawn group %s.", spawnId, data->spawnGroupData->name.c_str()); @@ -1642,6 +1641,7 @@ bool Creature::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, if (m_respawnTime) // respawn on Update { + ASSERT(m_respawnCompatibilityMode, "Creature (SpawnID %u) trying to load despite a respawn timer in progress.", spawnId); m_deathState = DEAD; if (CanFly()) { |