From a18808212e3f0e43dcb0ba099c003e45098c5dd9 Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Wed, 24 Apr 2019 20:08:07 +0200
Subject: Core/GameObject: Remove summoned gobs properly from the map without
 effecting other cases

Ref https://github.com/TrinityCore/TrinityCore/commit/0e8e3828f48120629b642d0de1db704fd0bb86cb
Ref #23115

(cherry picked from commit 9db64666dc30b1f8cad904bf8aeea1c9daf41c95)
---
 src/server/game/Entities/GameObject/GameObject.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 38ef02307b6..6ad8c58555c 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -919,17 +919,17 @@ void GameObject::Update(uint32 diff)
             if (!m_respawnDelayTime)
                 return;
 
-            if (!m_spawnId)
+            if (!m_spawnedByDefault && m_spawnId)
             {
                 m_respawnTime = 0;
-                Delete();
+                DestroyForNearbyPlayers();
                 return;
             }
 
             if (!m_spawnedByDefault)
             {
                 m_respawnTime = 0;
-                DestroyForNearbyPlayers();
+                Delete();
                 return;
             }
 
-- 
cgit v1.2.3