diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-01-09 20:41:35 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-11-18 23:03:14 +0100 |
| commit | f24e16a460e81e8bf6efe26498a31f5cfc559d78 (patch) | |
| tree | 41491d933606c825726b293210612540baa427e2 | |
| parent | 4c838dcb175fc8d1926f9e5d35d6a44ec1f06db3 (diff) | |
Core/Spells: Fixed crash with some gameobject spell casters
(cherry picked from commit 755133d8609c424c49be4bbe3bb4ec1ed02195f8)
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index e05beed9feb..a859128760c 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2792,10 +2792,10 @@ bool WorldObject::IsValidAssistTarget(WorldObject const* target, SpellInfo const // PvP case if (unitTarget && unitTarget->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) { - Player const* targetPlayerOwner = target->GetAffectingPlayer(); if (unit && unit->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED)) { Player const* selfPlayerOwner = GetAffectingPlayer(); + Player const* targetPlayerOwner = unitTarget->GetAffectingPlayer(); if (selfPlayerOwner && targetPlayerOwner) { // can't assist player which is dueling someone @@ -2803,7 +2803,7 @@ bool WorldObject::IsValidAssistTarget(WorldObject const* target, SpellInfo const return false; } // can't assist player in ffa_pvp zone from outside - if (unitTarget->IsFFAPvP() && unit && !unit->IsFFAPvP()) + if (unitTarget->IsFFAPvP() && !unit->IsFFAPvP()) return false; // can't assist player out of sanctuary from sanctuary if has pvp enabled |