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

Core/Auras: check conditions against referer caster, just as spells do

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ffa359c21cf92810d2c927496749148ff6ea9042)
This commit is contained in:
hondacrx
2021-08-09 10:00:05 -04:00
parent 08db42917e
commit a2628af13a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/Aura.cs
+6 -6
View File
@@ -2542,7 +2542,7 @@ namespace Game.Spells
// non-area aura // non-area aura
if (effect.Effect == SpellEffectName.ApplyAura) if (effect.Effect == SpellEffectName.ApplyAura)
{ {
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), GetUnitOwner(), condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList))
targetList.Add(GetUnitOwner()); targetList.Add(GetUnitOwner());
} }
else else
@@ -2572,7 +2572,7 @@ namespace Game.Spells
selectionType = SpellTargetCheckTypes.Enemy; selectionType = SpellTargetCheckTypes.Enemy;
break; break;
case SpellEffectName.ApplyAreaAuraPet: case SpellEffectName.ApplyAreaAuraPet:
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), GetUnitOwner(), condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList))
targetList.Add(GetUnitOwner()); targetList.Add(GetUnitOwner());
goto case SpellEffectName.ApplyAreaAuraOwner; goto case SpellEffectName.ApplyAreaAuraOwner;
case SpellEffectName.ApplyAreaAuraOwner: case SpellEffectName.ApplyAreaAuraOwner:
@@ -2580,7 +2580,7 @@ namespace Game.Spells
Unit owner = GetUnitOwner().GetCharmerOrOwner(); Unit owner = GetUnitOwner().GetCharmerOrOwner();
if (owner != null) if (owner != null)
if (GetUnitOwner().IsWithinDistInMap(owner, radius)) if (GetUnitOwner().IsWithinDistInMap(owner, radius))
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(owner, GetUnitOwner(), condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(owner, caster, condList))
targetList.Add(owner); targetList.Add(owner);
break; break;
} }
@@ -2588,13 +2588,13 @@ namespace Game.Spells
{ {
Unit pet = Global.ObjAccessor.GetUnit(GetUnitOwner(), GetUnitOwner().GetPetGUID()); Unit pet = Global.ObjAccessor.GetUnit(GetUnitOwner(), GetUnitOwner().GetPetGUID());
if (pet != null) if (pet != null)
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(pet, GetUnitOwner(), condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(pet, caster, condList))
targetList.Add(pet); targetList.Add(pet);
break; break;
} }
case SpellEffectName.ApplyAreaAuraSummons: case SpellEffectName.ApplyAreaAuraSummons:
{ {
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), GetUnitOwner(), condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList))
targetList.Add(GetUnitOwner()); targetList.Add(GetUnitOwner());
selectionType = SpellTargetCheckTypes.Summoned; selectionType = SpellTargetCheckTypes.Summoned;
@@ -2604,7 +2604,7 @@ namespace Game.Spells
if (selectionType != SpellTargetCheckTypes.Default) if (selectionType != SpellTargetCheckTypes.Default)
{ {
WorldObjectSpellAreaTargetCheck check = new(radius, GetUnitOwner(), caster, GetUnitOwner(), GetSpellInfo(), selectionType, condList, SpellTargetObjectTypes.Unit); WorldObjectSpellAreaTargetCheck check = new(radius, GetUnitOwner(), caster, caster, GetSpellInfo(), selectionType, condList, SpellTargetObjectTypes.Unit);
UnitListSearcher searcher = new(GetUnitOwner(), targetList, check); UnitListSearcher searcher = new(GetUnitOwner(), targetList, check);
Cell.VisitAllObjects(GetUnitOwner(), searcher, radius); Cell.VisitAllObjects(GetUnitOwner(), searcher, radius);