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

Core/GameObject: Fix linked traps not being despawned properly and remove deprecated code

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ffae92edd23a37d63aeed01544018944716b4a83)
This commit is contained in:
hondacrx
2021-09-08 23:40:52 -04:00
parent 41b76ef203
commit 0078a136a4
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+1 -6
View File
@@ -562,11 +562,6 @@ namespace Game.Entities
m_SkillupList.Clear(); m_SkillupList.Clear();
m_usetimes = 0; m_usetimes = 0;
// If nearby linked trap exists, respawn it
GameObject linkedTrap = GetLinkedTrap();
if (linkedTrap)
linkedTrap.SetLootState(LootState.Ready);
switch (GetGoType()) switch (GetGoType())
{ {
case GameObjectTypes.FishingNode: // can't fish now case GameObjectTypes.FishingNode: // can't fish now
@@ -768,7 +763,7 @@ namespace Game.Entities
// If nearby linked trap exists, despawn it // If nearby linked trap exists, despawn it
GameObject linkedTrap = GetLinkedTrap(); GameObject linkedTrap = GetLinkedTrap();
if (linkedTrap) if (linkedTrap)
linkedTrap.SetLootState(LootState.JustDeactivated); linkedTrap.DespawnOrUnsummon();
//if Gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed //if Gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed
if (GetGoType() == GameObjectTypes.Goober) if (GetGoType() == GameObjectTypes.Goober)