From f98d9936597891c20d2dc76954f382914865b0e6 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 14 Oct 2021 19:36:00 -0400 Subject: [PATCH] Core/GameObjects: Fixed DestroyGate battleground hook for vehicles Port From (https://github.com/TrinityCore/TrinityCore/commit/22298fb1725aa4d2f2ca49432a0eae490c923ae6) --- Source/Game/Entities/GameObject/GameObject.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 080119d17..0966031be 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -2292,11 +2292,12 @@ namespace Game.Entities EventInform(m_goInfo.DestructibleBuilding.DestroyedEvent, attackerOrHealer); GetAI().Destroyed(attackerOrHealer, m_goInfo.DestructibleBuilding.DestroyedEvent); - if (attackerOrHealer != null && attackerOrHealer.IsPlayer()) + Player player = attackerOrHealer != null ? attackerOrHealer.GetCharmerOrOwnerPlayerOrPlayerItself() : null; + if (player) { - var bg = attackerOrHealer.ToPlayer().GetBattleground(); + Battleground bg = player.GetBattleground(); if (bg != null) - bg.DestroyGate(attackerOrHealer.ToPlayer(), this); + bg.DestroyGate(player, this); } RemoveFlag(GameObjectFlags.Damaged);