Core/GameObject: Code cleanup

(cherry picked from commit 16a154c4e87ff1ff89323a8960bf601e6c18589b)

1 files changed, 6 insertions, 8 deletions

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