From 22298fb1725aa4d2f2ca49432a0eae490c923ae6 Mon Sep 17 00:00:00 2001 From: Maphaze <40966937+Maphaze@users.noreply.github.com> Date: Wed, 11 Jul 2018 18:14:09 +0200 Subject: Core/GameObjects: Fixed DestroyGate battleground hook for vehicles (#22145) (cherry picked from commit 2ef33158486831aa061050f5cc7d316fee17721d) --- src/server/game/Entities/GameObject/GameObject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 8d6941f635b..f5b649ad4fd 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2403,9 +2403,9 @@ void GameObject::SetDestructibleState(GameObjectDestructibleState state, WorldOb EventInform(m_goInfo->destructibleBuilding.DestroyedEvent, attackerOrHealer); AI()->Destroyed(attackerOrHealer, m_goInfo->destructibleBuilding.DestroyedEvent); - if (attackerOrHealer && attackerOrHealer->GetTypeId() == TYPEID_PLAYER) - if (Battleground* bg = attackerOrHealer->ToPlayer()->GetBattleground()) - bg->DestroyGate(attackerOrHealer->ToPlayer(), this); + if (Player* player = attackerOrHealer ? attackerOrHealer->GetCharmerOrOwnerPlayerOrPlayerItself() : nullptr) + if (Battleground* bg = player->GetBattleground()) + bg->DestroyGate(player, this); RemoveFlag(GO_FLAG_DAMAGED); AddFlag(GO_FLAG_DESTROYED); -- cgit v1.2.3