From 8757a80767a932ceea679e84881c7dd2f89322cb Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 27 Feb 2018 16:18:08 +0100 Subject: Core/Creature: Add another aggressive compatibility mode assertion to catch faulty dynspawn code. (cherry picked from commit 3eab2d7efcc225696fe32f94687fd8e7b6755a2a) --- src/server/game/Entities/Creature/Creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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()) { -- cgit v1.2.3