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)

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.cpp
This commit is contained in:
Killyana authored and Ovahlord committed 2019-04-26 17:53:36 +02:00
1 parent 00a2de63ad
commit b7f63b29a0
1 file changed
+7 -7
@@ -693,17 +693,17 @@ void GameObject::Update(uint32 diff)
if (!m_respawnDelayTime)
return;
if (!m_spawnId)
{
m_respawnTime = 0;
Delete();
return;
}
if (!m_spawnedByDefault && m_spawnId)
{
m_respawnTime = 0;
DestroyForNearbyPlayers();
return;
}
if (!m_spawnedByDefault)
{
m_respawnTime = 0;
DestroyForNearbyPlayers();
Delete();
return;
}