From e395af341a21fc0636dea2b8081bf11678de4182 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 3 Sep 2022 11:16:35 +0200 Subject: [PATCH] Core/Spells: Fixed crash with some gameobject spell casters --- src/server/game/Entities/Object/Object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 8883016b5a..f8343d159e 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3137,10 +3137,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 = target->GetAffectingPlayer(); 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 @@ -3148,7 +3148,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