aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp14
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 85fc68c11b6..6ad2416d24f 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -794,17 +794,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;
}