From b5d1877d0ec5a138b3f60a7b91b3a88c0979e711 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 18 Nov 2021 20:19:10 -0500 Subject: [PATCH] Core/Spells: Fixed crash with some gameobject spell casters Port From (https://github.com/TrinityCore/TrinityCore/commit/f24e16a460e81e8bf6efe26498a31f5cfc559d78) --- Source/Game/Entities/Object/WorldObject.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs index c3bcd21cf..f746a743d 100644 --- a/Source/Game/Entities/Object/WorldObject.cs +++ b/Source/Game/Entities/Object/WorldObject.cs @@ -2439,10 +2439,10 @@ namespace Game.Entities // PvP case if (unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.PlayerControlled)) { - Player targetPlayerOwner = target.GetAffectingPlayer(); if (unit != null && unit.HasUnitFlag(UnitFlags.PlayerControlled)) { Player selfPlayerOwner = GetAffectingPlayer(); + Player targetPlayerOwner = unitTarget.GetAffectingPlayer(); if (selfPlayerOwner != null && targetPlayerOwner != null) { // can't assist player which is dueling someone @@ -2450,7 +2450,7 @@ namespace Game.Entities 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