From 00a2de63adf051bebbbf8da5d8b217d0dc9b1c6d Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Tue, 23 Apr 2019 16:43:49 +0200
Subject: [PATCH] Core/GameObject: Delete summoned gobs and
 DestroyForNearbyPlayers gobs spawned with negative spawn time once the gob is
 deactivated

(cherry picked from commit 0e8e3828f48120629b642d0de1db704fd0bb86cb)
---
 src/server/game/Entities/GameObject/GameObject.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 8b2f7a9da7d..abc07c6eb38 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -693,10 +693,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;
             }