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

Core/Spell: Fix name clashing between local variables and class member fields

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c66bcc4c0ef0be3caac8c2e1b2e361de678fb6e4)
This commit is contained in:
hondacrx
2022-04-28 09:54:59 -04:00
parent c15577587f
commit b99f45b472
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+6 -2
View File
@@ -2327,6 +2327,7 @@ namespace Game.Spells
}
else // aura is dispelled
{
Unit unitCaster = m_caster.ToUnit();
if (unitCaster != null)
unitCaster.RemoveChannelObject(targetInfo.TargetGUID);
continue;
@@ -4465,7 +4466,6 @@ namespace Game.Spells
corpseTarget = pCorpseTarget;
destTarget = m_destTargets[spellEffectInfo.EffectIndex].Position;
effectInfo = spellEffectInfo;
unitCaster = m_originalCaster ? m_originalCaster : m_caster.ToUnit();
damage = CalculateDamage(spellEffectInfo, unitTarget, out _variance);
@@ -7042,6 +7042,11 @@ namespace Game.Spells
m_spellInfo.HasAttribute(SpellAttr8.AuraSendAmount) || m_spellInfo.HasHitDelay() || (m_triggeredByAuraSpell == null && !IsTriggered());
}
public Unit GetUnitCasterForEffectHandlers()
{
return m_originalCaster != null ? m_originalCaster : m_caster.ToUnit();
}
bool IsValidDeadOrAliveTarget(Unit target)
{
if (target.IsAlive())
@@ -7846,7 +7851,6 @@ namespace Game.Spells
SpellEffectHandleMode effectHandleMode;
public SpellEffectInfo effectInfo;
// used in effects handlers
Unit unitCaster;
internal UnitAura spellAura;
internal DynObjAura dynObjAura;