From 5ef08fa5e862fa76e2fe481bb63a31d801cb8ac5 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Wed, 24 Apr 2019 20:33:04 +0200
Subject: [PATCH] Core/GameObject: Code cleanup

(cherry picked from commit 16a154c4e87ff1ff89323a8960bf601e6c18589b)
---
 src/server/game/Entities/GameObject/GameObject.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index a65b0c57ae0..5fd052f1d62 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -693,17 +693,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;
             }