Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/GameObject: Remove linked traps when the main GameObject is removed

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/88b898b92c9b2cc885b4c7371192a8aef9ebda85)
This commit is contained in:
hondacrx
2022-02-18 13:26:17 -05:00
parent 5d8b77b440
commit 6cc694f990
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+6 -5
View File
@@ -153,6 +153,12 @@ namespace Game.Entities
if (m_model != null) if (m_model != null)
if (GetMap().ContainsGameObjectModel(m_model)) if (GetMap().ContainsGameObjectModel(m_model))
GetMap().RemoveGameObjectModel(m_model); GetMap().RemoveGameObjectModel(m_model);
// If linked trap exists, despawn it
GameObject linkedTrap = GetLinkedTrap();
if (linkedTrap != null)
linkedTrap.DespawnOrUnsummon();
base.RemoveFromWorld(); base.RemoveFromWorld();
if (m_spawnId != 0) if (m_spawnId != 0)
@@ -938,11 +944,6 @@ namespace Game.Entities
public void Delete() public void Delete()
{ {
// If nearby linked trap exists, despawn it
GameObject linkedTrap = GetLinkedTrap();
if (linkedTrap != null)
linkedTrap.DespawnOrUnsummon();
SetLootState(LootState.NotReady); SetLootState(LootState.NotReady);
RemoveFromOwner(); RemoveFromOwner();