Core/GameObject: Code cleanup

Port From (https://github.com/TrinityCore/TrinityCore/commit/73c6c13ace28dc62bb13789e75c304426a16d5bf)
2021-12-01 20:51:32 -05:00
parent 3dd12575d9
commit 112970fb72
1 changed files with 6 additions and 8 deletions
@@ -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;
                    }