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

Core/Units: Refactor GetCastSpellInfo to return values via return value and hide internal lookup state tracker

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e233079d2d8dbdc1bcd7beb593f047b26a6c4cc9)
This commit is contained in:
Hondacrx
2025-06-15 17:31:17 -04:00
parent 827c97a613
commit 0a135aa6f3
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Spells.cs
+17 -9
View File
@@ -944,9 +944,18 @@ namespace Game.Entities
spell.Finish(result);
}
public virtual SpellInfo GetCastSpellInfo(SpellInfo spellInfo, TriggerCastFlags triggerFlag, GetCastSpellInfoContext context)
public (SpellInfo, TriggerCastFlags) GetCastSpellInfo(SpellInfo spellInfo)
{
SpellInfo findMatchingAuraEffectIn(AuraType type)
GetCastSpellInfoContext context = new();
TriggerCastFlags triggerFlag = TriggerCastFlags.None;
var newSpellInfo = GetCastSpellInfo(spellInfo, ref triggerFlag, context);
return (newSpellInfo, triggerFlag);
}
public virtual SpellInfo GetCastSpellInfo(SpellInfo spellInfo, ref TriggerCastFlags triggerFlag, GetCastSpellInfoContext context)
{
SpellInfo findMatchingAuraEffectIn(AuraType type, ref TriggerCastFlags triggerFlag)
{
foreach (AuraEffect auraEffect in GetAuraEffectsByType(type))
{
@@ -967,26 +976,25 @@ namespace Game.Entities
triggerFlag &= ~TriggerCastFlags.IgnoreShapeshift;
return info;
}
}
}
return null;
}
};
SpellInfo newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpells);
SpellInfo newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpells, ref triggerFlag);
if (newInfo != null)
{
triggerFlag &= ~TriggerCastFlags.IgnoreCastTime;
return GetCastSpellInfo(newInfo, triggerFlag, context);
return GetCastSpellInfo(newInfo, ref triggerFlag, context);
}
newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpellsTriggered);
newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpellsTriggered, ref triggerFlag);
if (newInfo != null)
{
triggerFlag |= TriggerCastFlags.IgnoreCastTime;
return GetCastSpellInfo(newInfo, triggerFlag, context);
return GetCastSpellInfo(newInfo, ref triggerFlag, context);
}
return spellInfo;
@@ -4644,7 +4652,7 @@ namespace Game.Entities
return true;
}
return false;
return false;// no free slots left
}
}
}