aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKillyana <morphone1@gmail.com>2019-04-24 20:08:07 +0200
committerKillyana <morphone1@gmail.com>2019-04-24 20:08:07 +0200
commit9db64666dc30b1f8cad904bf8aeea1c9daf41c95 (patch)
tree46b52dbc9fc6adeb33c64b3e0997f8038651c0eb
parentae8750716f63ddc41f21bb38ceafe949d7260f0e (diff)
Core/GameObject: Remove summoned gobs properly from the map without effecting other cases
Ref https://github.com/TrinityCore/TrinityCore/commit/0e8e3828f48120629b642d0de1db704fd0bb86cb Ref #23115
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp6
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 37c475a7f77..85fc68c11b6 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -794,17 +794,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;
}