From a99a60bcf36614c038efd33a1bd9e057935b3aaf Mon Sep 17 00:00:00 2001
From: Killyana <6587064+Killyana@users.noreply.github.com>
Date: Mon, 18 Mar 2019 01:04:38 +0100
Subject: Core/GameObject: Remove summoned game objects from the map after
 calling  SetSpawnedByDefault(false) (#23120)

Closes #23115

(cherry picked from commit 5f04c829a861da7d5a4f0ac955d6c1fbcd917af9)
---
 src/server/game/Entities/GameObject/GameObject.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 63a77e39ebc..41858e5414f 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -919,11 +919,10 @@ void GameObject::Update(uint32 diff)
             if (!m_respawnDelayTime)
                 return;
 
-            // ToDo: Decide if we should properly despawn these. Maybe they expect to be able to manually respawn from script?
             if (!m_spawnedByDefault)
             {
                 m_respawnTime = 0;
-                DestroyForNearbyPlayers(); // old UpdateObjectVisibility()
+                Delete();
                 return;
             }
 
-- 
cgit v1.2.3