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

Core/Unit: fixed Global cooldown cancelation on spell interrupt

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/df585571f108b3c44d3db1ab82683151f798cbf7)
This commit is contained in:
hondacrx
2021-06-23 14:06:43 -04:00
parent ad2d0f912e
commit 0b0ab3b059
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Spells.cs
+9 -10
View File
@@ -1447,22 +1447,20 @@ namespace Game.Entities
AuraType[] diseaseAuraTypes = AuraType[] diseaseAuraTypes =
{ {
AuraType.PeriodicDamage, // Frost Fever and Blood Plague AuraType.PeriodicDamage, // Frost Fever and Blood Plague
AuraType.Linked, // Crypt Fever and Ebon Plague AuraType.Linked // Crypt Fever and Ebon Plague
AuraType.None
}; };
uint diseases = 0; uint diseases = 0;
foreach (var aura in diseaseAuraTypes) foreach (var aType in diseaseAuraTypes)
{ {
if (aura == AuraType.None) if (aType == AuraType.None)
break; break;
for (var i = 0; i < m_modAuras[aura].Count;) for (var i = 0; i < m_modAuras[aType].Count;)
{ {
var eff = m_modAuras[aura][i]; var eff = m_modAuras[aType][i];
// Get auras with disease dispel type by caster // Get auras with disease dispel type by caster
if (eff.GetSpellInfo().Dispel == DispelType.Disease if (eff.GetSpellInfo().Dispel == DispelType.Disease && eff.GetCasterGUID() == casterGUID)
&& eff.GetCasterGUID() == casterGUID)
{ {
++diseases; ++diseases;
@@ -2850,12 +2848,13 @@ namespace Game.Entities
if (IsTypeId(TypeId.Player)) if (IsTypeId(TypeId.Player))
ToPlayer().SendAutoRepeatCancel(this); ToPlayer().SendAutoRepeatCancel(this);
m_currentSpells[spellType] = null;
if (spell.GetState() != SpellState.Finished) if (spell.GetState() != SpellState.Finished)
spell.Cancel(); spell.Cancel();
else else
{
m_currentSpells[spellType] = null;
spell.SetReferencedFromCurrent(false); spell.SetReferencedFromCurrent(false);
}
if (IsCreature() && IsAIEnabled) if (IsCreature() && IsAIEnabled)
ToCreature().GetAI().OnSpellCastInterrupt(spell.GetSpellInfo()); ToCreature().GetAI().OnSpellCastInterrupt(spell.GetSpellInfo());