diff options
author | Killyana <morphone1@gmail.com> | 2019-04-24 20:08:07 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-12-02 00:39:20 +0100 |
commit | a18808212e3f0e43dcb0ba099c003e45098c5dd9 (patch) | |
tree | 20898a14f072fda765ea0efbff294a0e87d69fb8 | |
parent | a2c0f6d32113c8ff42760c389826bad80ce77815 (diff) |
Core/GameObject: Remove summoned gobs properly from the map without effecting other cases
Ref https://github.com/TrinityCore/TrinityCore/commit/0e8e3828f48120629b642d0de1db704fd0bb86cb
Ref #23115
(cherry picked from commit 9db64666dc30b1f8cad904bf8aeea1c9daf41c95)
-rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 38ef02307b6..6ad8c58555c 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -919,17 +919,17 @@ void GameObject::Update(uint32 diff) if (!m_respawnDelayTime) return; - if (!m_spawnId) + if (!m_spawnedByDefault && m_spawnId) { m_respawnTime = 0; - Delete(); + DestroyForNearbyPlayers(); return; } if (!m_spawnedByDefault) { m_respawnTime = 0; - DestroyForNearbyPlayers(); + Delete(); return; } |