From 0e8e3828f48120629b642d0de1db704fd0bb86cb Mon Sep 17 00:00:00 2001 From: Killyana Date: Tue, 23 Apr 2019 16:43:49 +0200 Subject: Core/GameObject: Delete summoned gobs and DestroyForNearbyPlayers gobs spawned with negative spawn time once the gob is deactivated --- src/server/game/Entities/GameObject/GameObject.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/server/game/Entities/GameObject') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index dfb57d955d6..438b5a3b061 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -794,10 +794,17 @@ void GameObject::Update(uint32 diff) if (!m_respawnDelayTime) return; + if (!m_spawnId) + { + m_respawnTime = 0; + Delete(); + return; + } + if (!m_spawnedByDefault) { m_respawnTime = 0; - Delete(); + DestroyForNearbyPlayers(); return; } -- cgit v1.2.3