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

Core/Auras: Fixed cherry-pick mistakes in Unit::RemoveMovementImpairingAuras and Unit::HasAuraWithMechanic

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/9d7eee1a8cc0fbfe297f2114446e5f634255b3f3)
This commit is contained in:
hondacrx
2021-09-05 10:14:01 -04:00
parent fcb7edb93f
commit 1e96f4a663
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Spells.cs
+6 -9
View File
@@ -2195,13 +2195,10 @@ namespace Game.Entities
} }
// turn off snare auras by setting amount to 0 // turn off snare auras by setting amount to 0
foreach (SpellEffectInfo effect in aura.GetSpellInfo().GetEffects()) foreach (SpellEffectInfo spellEffectInfo in aura.GetSpellInfo().GetEffects())
{ {
if (effect == null || !effect.IsEffect()) if (spellEffectInfo != null && pair.Value.HasEffect(spellEffectInfo.EffectIndex) && spellEffectInfo.Mechanic == Mechanics.Snare)
continue; aura.GetEffect(spellEffectInfo.EffectIndex).ChangeAmount(0);
if (Convert.ToBoolean((1 << (int)effect.EffectIndex) & pair.Value.GetEffectMask()))
aura.GetEffect(effect.EffectIndex).ChangeAmount(0);
} }
} }
} }
@@ -2646,9 +2643,9 @@ namespace Game.Entities
if (spellInfo.Mechanic != 0 && Convert.ToBoolean(mechanicMask & (1 << (int)spellInfo.Mechanic))) if (spellInfo.Mechanic != 0 && Convert.ToBoolean(mechanicMask & (1 << (int)spellInfo.Mechanic)))
return true; return true;
foreach (SpellEffectInfo effect in spellInfo.GetEffects()) foreach (SpellEffectInfo spellEffectInfo in spellInfo.GetEffects())
if (effect != null && effect.Effect != 0 && effect.Mechanic != 0) if (spellEffectInfo != null && pair.Value.HasEffect(spellEffectInfo.EffectIndex) && spellEffectInfo.IsEffect() && spellEffectInfo.Mechanic != 0)
if (Convert.ToBoolean(mechanicMask & (1 << (int)effect.Mechanic))) if ((mechanicMask & (1 << (int)spellEffectInfo.Mechanic)) != 0)
return true; return true;
} }