aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaphaze <40966937+Maphaze@users.noreply.github.com>2018-07-11 18:14:09 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-14 00:11:29 +0200
commit22298fb1725aa4d2f2ca49432a0eae490c923ae6 (patch)
treedad080a2197b003a7229961c159b1519e6be0763 /src
parent550513ba65772535b07f38175e151d980e4fc084 (diff)
Core/GameObjects: Fixed DestroyGate battleground hook for vehicles (#22145)
(cherry picked from commit 2ef33158486831aa061050f5cc7d316fee17721d)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp6
1 files changed, 3 insertions, 3 deletions
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);