diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-02-27 22:10:36 +0100 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2018-02-27 22:10:36 +0100 |
| commit | 9fc6b13027d2d66a99b6bee49d3add23f2c0c8af (patch) | |
| tree | 16ff70e822cce00ca05ad1f67b0e856045de0223 /src | |
| parent | 3eab2d7efcc225696fe32f94687fd8e7b6755a2a (diff) | |
Core/Creature: Temporarily let Creatures violate dynspawn assumptions for pooled creatures. This should fix startup crashes until I can investigate and find a long-term fix. Tag #21519.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9d6ca8097f7..5aae0f6db05 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1635,13 +1635,14 @@ bool Creature::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, 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()); + // @todo pools need fixing! this is just a temporary crashfix, but they violate dynspawn principles + ASSERT(m_respawnCompatibilityMode || sPoolMgr->IsPartOfAPool<Creature>(spawnId), "Creature (SpawnID %u) trying to load in inactive spawn group %s.", spawnId, data->spawnGroupData->name.c_str()); m_respawnTime = GameTime::GetGameTime() + urand(4, 7); } if (m_respawnTime) // respawn on Update { - ASSERT(m_respawnCompatibilityMode, "Creature (SpawnID %u) trying to load despite a respawn timer in progress.", spawnId); + ASSERT(m_respawnCompatibilityMode || sPoolMgr->IsPartOfAPool<Creature>(spawnId), "Creature (SpawnID %u) trying to load despite a respawn timer in progress.", spawnId); m_deathState = DEAD; if (CanFly()) { |