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

Core/Spell: fix for hitmask being ignored in finish phase procs

Browse Source
This commit is contained in:
hondacrx
2018-03-12 14:53:18 -04:00
parent ab54543573
commit 46052921fe
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+5 -6
View File
@@ -1876,7 +1876,7 @@ namespace Game.Spells
// Fill base trigger info // Fill base trigger info
ProcFlags procAttacker = m_procAttacker; ProcFlags procAttacker = m_procAttacker;
ProcFlags procVictim = m_procVictim; ProcFlags procVictim = m_procVictim;
ProcFlagsHit hitMask = m_hitMask; ProcFlagsHit hitMask = ProcFlagsHit.None;
m_spellAura = null; m_spellAura = null;
@@ -2062,6 +2062,9 @@ namespace Game.Spells
} }
} }
// set hitmask for finish procs
m_hitMask |= hitMask;
// spellHitTarget can be null if spell is missed in DoSpellHitOnUnit // spellHitTarget can be null if spell is missed in DoSpellHitOnUnit
if (missInfo != SpellMissInfo.Evade && spellHitTarget && !m_caster.IsFriendlyTo(unit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel))) if (missInfo != SpellMissInfo.Evade && spellHitTarget && !m_caster.IsFriendlyTo(unit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel)))
{ {
@@ -3148,11 +3151,7 @@ namespace Game.Spells
procAttacker = m_spellInfo.IsPositive() ? ProcFlags.DoneSpellNoneDmgClassPos : ProcFlags.DoneSpellNoneDmgClassNeg; procAttacker = m_spellInfo.IsPositive() ? ProcFlags.DoneSpellNoneDmgClassPos : ProcFlags.DoneSpellNoneDmgClassNeg;
} }
ProcFlagsHit hitMask = m_hitMask; m_originalCaster.ProcSkillsAndAuras(null, procAttacker, ProcFlags.None, ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.Finish, m_hitMask, this, null, null);
if (!hitMask.HasAnyFlag(ProcFlagsHit.Critical))
hitMask |= ProcFlagsHit.Normal;
m_originalCaster.ProcSkillsAndAuras(null, procAttacker, ProcFlags.None, ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.Finish, hitMask, this, null, null);
} }
void SendSpellCooldown() void SendSpellCooldown()