From b7f63b29a0bef27b25fd82ce0a083db8985ed45e Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Wed, 24 Apr 2019 20:08:07 +0200
Subject: [PATCH] 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)

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.cpp
---
 src/server/game/Entities/GameObject/GameObject.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index abc07c6eb38..a65b0c57ae0 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -693,17 +693,17 @@ void GameObject::Update(uint32 diff)
             if (!m_respawnDelayTime)
                 return;
 
-            if (!m_spawnId)
-             {
-                 m_respawnTime = 0;
-                 Delete();
-                 return;
-             }
+            if (!m_spawnedByDefault && m_spawnId)
+            {
+                m_respawnTime = 0;
+                DestroyForNearbyPlayers();
+                return;
+            }
 
             if (!m_spawnedByDefault)
             {
                 m_respawnTime = 0;
-                DestroyForNearbyPlayers();
+                Delete();
                 return;
             }