Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4b93059ec79f06effeeb4c164e426e0276b24193)
This commit is contained in:
hondacrx
2021-08-09 11:38:27 -04:00
parent 1f72103d78
commit f31d3ec432
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+3 -2
View File
@@ -3146,13 +3146,14 @@ namespace Game.Entities
if (m_respawnTime == 0 && !map.IsSpawnGroupActive(data.spawnGroupData.groupId)) if (m_respawnTime == 0 && !map.IsSpawnGroupActive(data.spawnGroupData.groupId))
{ {
Cypher.Assert(m_respawnCompatibilityMode, $"Creature (SpawnID {spawnId}) trying to load in inactive spawn group {data.spawnGroupData.name}."); // @todo pools need fixing! this is just a temporary crashfix, but they violate dynspawn principles
Cypher.Assert(m_respawnCompatibilityMode || Global.PoolMgr.IsPartOfAPool<Creature>(spawnId) != 0, $"Creature (SpawnID {spawnId}) trying to load in inactive spawn group {data.spawnGroupData.name}.");
m_respawnTime = GameTime.GetGameTime() + RandomHelper.URand(4, 7); m_respawnTime = GameTime.GetGameTime() + RandomHelper.URand(4, 7);
} }
if (m_respawnTime != 0) // respawn on UpdateLoadCreatureFromDB if (m_respawnTime != 0) // respawn on UpdateLoadCreatureFromDB
{ {
Cypher.Assert(m_respawnCompatibilityMode, $"Creature (SpawnID {spawnId}) trying to load despite a respawn timer in progress."); Cypher.Assert(m_respawnCompatibilityMode || Global.PoolMgr.IsPartOfAPool<Creature>(spawnId) != 0, $"Creature (SpawnID {spawnId}) trying to load despite a respawn timer in progress.");
m_deathState = DeathState.Dead; m_deathState = DeathState.Dead;
if (CanFly()) if (CanFly())
{ {