Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fixed crash with some gameobject spell casters

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f24e16a460e81e8bf6efe26498a31f5cfc559d78)
This commit is contained in:
hondacrx
2021-11-18 20:19:10 -05:00
parent 58eb8a4fd7
commit b5d1877d0e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/WorldObject.cs
+2 -2
View File
@@ -2439,10 +2439,10 @@ namespace Game.Entities
// PvP case // PvP case
if (unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.PlayerControlled)) if (unitTarget != null && unitTarget.HasUnitFlag(UnitFlags.PlayerControlled))
{ {
Player targetPlayerOwner = target.GetAffectingPlayer();
if (unit != null && unit.HasUnitFlag(UnitFlags.PlayerControlled)) if (unit != null && unit.HasUnitFlag(UnitFlags.PlayerControlled))
{ {
Player selfPlayerOwner = GetAffectingPlayer(); Player selfPlayerOwner = GetAffectingPlayer();
Player targetPlayerOwner = unitTarget.GetAffectingPlayer();
if (selfPlayerOwner != null && targetPlayerOwner != null) if (selfPlayerOwner != null && targetPlayerOwner != null)
{ {
// can't assist player which is dueling someone // can't assist player which is dueling someone
@@ -2450,7 +2450,7 @@ namespace Game.Entities
return false; return false;
} }
// can't assist player in ffa_pvp zone from outside // can't assist player in ffa_pvp zone from outside
if (unitTarget.IsFFAPvP() && unit && !unit.IsFFAPvP()) if (unitTarget.IsFFAPvP() && !unit.IsFFAPvP())
return false; return false;
// can't assist player out of sanctuary from sanctuary if has pvp enabled // can't assist player out of sanctuary from sanctuary if has pvp enabled