From 16a154c4e87ff1ff89323a8960bf601e6c18589b Mon Sep 17 00:00:00 2001 From: jackpoz Date: Wed, 24 Apr 2019 20:33:04 +0200 Subject: Core/GameObject: Code cleanup --- src/server/game/Entities/GameObject/GameObject.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3