From 3dd12575d97210be749fb5dd29fb8c1a5c26f123 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 1 Dec 2021 20:50:49 -0500
Subject: [PATCH] Core/GameObject: Remove summoned gobs properly from the map
 without effecting other cases

Port From (https://github.com/TrinityCore/TrinityCore/commit/a18808212e3f0e43dcb0ba099c003e45098c5dd9)
---
 Source/Game/Entities/GameObject/GameObject.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 480be1f44..bcca71419 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -831,17 +831,17 @@ namespace Game.Entities
                     if (m_respawnDelayTime == 0)
                         return;
 
-                    if (m_spawnId == 0)
+                    if (m_spawnedByDefault && m_spawnId != 0)
                     {
                         m_respawnTime = 0;
-                        Delete();
+                        DestroyForNearbyPlayers();
                         return;
                     }
 
                     if (!m_spawnedByDefault)
                     {
                         m_respawnTime = 0;
-                        DestroyForNearbyPlayers();
+                        Delete();
                         return;
                     }