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

Core/Spells: Implemented SPELL_ATTR8_CAN_HIT_AOE_UNTARGETABLE

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/877ae5b47d56a754b56f1326990f5ae41aa989c9)
This commit is contained in:
hondacrx
2024-02-21 21:05:21 -05:00
parent a9b13b7891
commit 33f3e9d68f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/WorldObject.cs
+2 -2
View File
@@ -2616,7 +2616,7 @@ namespace Game.Entities
if (!unitTarget.HasUnitFlag(UnitFlags.PlayerControlled) && unitOrOwner.IsImmuneToNPC())
return false;
if (bySpell == null || !bySpell.HasAttribute(SpellAttr8.AttackIgnoreImmuneToPcFlag))
if (bySpell == null || !bySpell.HasAttribute(SpellAttr8.CanAttackImmunePC))
{
if (unitOrOwner.HasUnitFlag(UnitFlags.PlayerControlled) && unitTarget.IsImmuneToPC())
return false;
@@ -2761,7 +2761,7 @@ namespace Game.Entities
{
if (unit != null && unit.HasUnitFlag(UnitFlags.PlayerControlled))
{
if (bySpell == null || !bySpell.HasAttribute(SpellAttr8.AttackIgnoreImmuneToPcFlag))
if (bySpell == null || !bySpell.HasAttribute(SpellAttr8.CanAttackImmunePC))
if (unitTarget != null && unitTarget.IsImmuneToPC())
return false;
}
Source/Game/Spells/Spell.cs
+1 -1
View File
@@ -9191,7 +9191,7 @@ namespace Game.Spells
switch (_searchReason)
{
case WorldObjectSpellAreaTargetSearchReason.Area:
if (unitTarget.GetSpellOtherImmunityMask().HasFlag(SpellOtherImmunity.AoETarget))
if (!_spellInfo.HasAttribute(SpellAttr8.CanHitAoeUntargetable) && unitTarget.GetSpellOtherImmunityMask().HasFlag(SpellOtherImmunity.AoETarget))
return false;
break;
case WorldObjectSpellAreaTargetSearchReason.Chain: