From 112970fb72b4c4687862e26b15db90397d93ae63 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 1 Dec 2021 20:51:32 -0500
Subject: [PATCH] Core/GameObject: Code cleanup

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

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