diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 292092ddc92..3909f76cd67 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2961,10 +2961,10 @@ bool WorldObject::IsValidAssistTarget(WorldObject const* target, SpellInfo const // PvP case if (unitTarget && unitTarget->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED)) { - Player const* targetPlayerOwner = unitTarget->GetAffectingPlayer(); - if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED)) + if (unit && unit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED)) { Player const* selfPlayerOwner = GetAffectingPlayer(); + Player const* targetPlayerOwner = unitTarget->GetAffectingPlayer(); if (selfPlayerOwner && targetPlayerOwner) { // can't assist player which is dueling someone @@ -2972,7 +2972,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 |