From 34144e11b0938b991388c8d03217b6381ea5572c Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 1 Dec 2021 20:47:34 -0500 Subject: [PATCH] Core/GameObject: Delete summoned gobs and DestroyForNearbyPlayers gobs spawned with negative spawn time once the gob is deactivated Port From (https://github.com/TrinityCore/TrinityCore/commit/62d3010e56e018ffab0d3a0548d0b8ec51ab9964) --- Source/Game/Entities/GameObject/GameObject.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 3e61c5d7b..480be1f44 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -831,13 +831,20 @@ namespace Game.Entities if (m_respawnDelayTime == 0) return; - if (!m_spawnedByDefault) + if (m_spawnId == 0) { m_respawnTime = 0; Delete(); return; } + if (!m_spawnedByDefault) + { + m_respawnTime = 0; + DestroyForNearbyPlayers(); + return; + } + uint respawnDelay = m_respawnDelayTime; uint scalingMode = WorldConfig.GetUIntValue(WorldCfg.RespawnDynamicMode); if (scalingMode != 0)