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

Core/Spells: Implemented SPELL_ATTR5_IGNORE_AREA_EFFECT_PVP_CHECK

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d71ca7a8f5aab79a7ee662dbc5632a0de7dede3f)
This commit is contained in:
hondacrx
2022-06-01 13:54:41 -04:00
parent c971cae3bb
commit da9cd08caa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+1 -1
View File
@@ -1763,7 +1763,7 @@ namespace Framework.Constants
AllowWhileStunned = 0x08, // Allow While Stunned AllowWhileStunned = 0x08, // Allow While Stunned
TriggersChanneling = 0x10, // Triggers Channeling TriggersChanneling = 0x10, // Triggers Channeling
LimitN = 0x20, // Limit N Description Remove Previous Application To Another Unit If Applied LimitN = 0x20, // Limit N Description Remove Previous Application To Another Unit If Applied
IgnoreAreaEffectPvpCheck = 0x40, /*Nyi*/ // Ignore Area Effect Pvp Check IgnoreAreaEffectPvpCheck = 0x40, // Ignore Area Effect Pvp Check
NotOnPlayer = 0x80, /*Nyi*/ // Not On Player NotOnPlayer = 0x80, /*Nyi*/ // Not On Player
NotOnPlayerControlledNpc = 0x100, /*Nyi*/ // Not On Player Controlled Npc NotOnPlayerControlledNpc = 0x100, /*Nyi*/ // Not On Player Controlled Npc
ExtraInitialPeriod = 0x200, // Extra Initial Period Description Immediately Do Periodic Tick On Apply ExtraInitialPeriod = 0x200, // Extra Initial Period Description Immediately Do Periodic Tick On Apply
Source/Game/Entities/Object/WorldObject.cs
+1 -1
View File
@@ -2641,7 +2641,7 @@ namespace Game.Entities
// additional checks - only PvP case // additional checks - only PvP case
if (playerAffectingAttacker && playerAffectingTarget) if (playerAffectingAttacker && playerAffectingTarget)
{ {
if (playerAffectingTarget.IsPvP()) if (playerAffectingTarget.IsPvP() || (bySpell != null && bySpell.HasAttribute(SpellAttr5.IgnoreAreaEffectPvpCheck)))
return true; return true;
if (playerAffectingAttacker.IsFFAPvP() && playerAffectingTarget.IsFFAPvP()) if (playerAffectingAttacker.IsFFAPvP() && playerAffectingTarget.IsFFAPvP())