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

Core/GameObject: Fix an edge case where GOs might never respawn after being manually despawned.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/eb7a8584e227b7cbd68c051c044f08c47019586b)
This commit is contained in:
hondacrx
2021-10-14 19:47:15 -04:00
parent be1afd7949
commit 5e1494e4b4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+6 -1
View File
@@ -435,8 +435,11 @@ namespace Game.Entities
if (m_despawnDelay > diff) if (m_despawnDelay > diff)
m_despawnDelay -= diff; m_despawnDelay -= diff;
else else
{
m_despawnDelay = 0;
DespawnOrUnsummon(TimeSpan.FromMilliseconds(0), m_despawnRespawnTime); DespawnOrUnsummon(TimeSpan.FromMilliseconds(0), m_despawnRespawnTime);
} }
}
switch (m_lootState) switch (m_lootState)
{ {
@@ -895,10 +898,12 @@ namespace Game.Entities
} }
} }
else else
{
if (m_goData != null)
{ {
uint respawnDelay = (uint)((forceRespawnTime > TimeSpan.Zero) ? forceRespawnTime.TotalSeconds : m_respawnDelayTime); uint respawnDelay = (uint)((forceRespawnTime > TimeSpan.Zero) ? forceRespawnTime.TotalSeconds : m_respawnDelayTime);
if (m_goData != null && respawnDelay != 0)
SaveRespawnTime(respawnDelay); SaveRespawnTime(respawnDelay);
}
Delete(); Delete();
} }
} }