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

Core/Auras: Fixed SPELLVALUE_AURA_STACK adding incorrect number of stacks on aura refresh

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4c605ce621a137f32cf02527d48e36fed1b6e235)
This commit is contained in:
Hondacrx
2025-08-09 21:38:54 -04:00
parent 59cfc97e15
commit e48d7c9778
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/Aura.cs
+5 -3
View File
@@ -353,7 +353,7 @@ namespace Game.Spells
m_updateTargetMapInterval = 0;
m_casterLevel = createInfo.Caster != null ? createInfo.Caster.GetLevel() : m_spellInfo.SpellLevel;
m_procCharges = 0;
m_stackAmount = 1;
m_stackAmount = (byte)createInfo.StackAmount;
m_isRemoved = false;
m_isSingleTarget = false;
m_isUsingCharges = false;
@@ -1133,13 +1133,12 @@ namespace Game.Spells
return key;
}
public void SetLoadedState(int maxduration, int duration, int charges, byte stackamount, uint recalculateMask, int[] amount)
public void SetLoadedState(int maxduration, int duration, int charges, uint recalculateMask, int[] amount)
{
m_maxDuration = maxduration;
m_duration = duration;
m_procCharges = (byte)charges;
m_isUsingCharges = m_procCharges != 0;
m_stackAmount = stackamount;
Unit caster = GetCaster();
foreach (AuraEffect effect in GetAuraEffects())
{
@@ -3070,6 +3069,7 @@ namespace Game.Spells
public uint CastItemId = 0;
public int CastItemLevel = -1;
public bool IsRefresh;
public int StackAmount = 1;
public bool ResetPeriodicTimer = true;
internal ObjectGuid _castId;
@@ -3100,6 +3100,8 @@ namespace Game.Spells
public void SetBaseAmount(int[] bp) { BaseAmount = bp; }
public void SetCastItem(ObjectGuid guid, uint itemId, int itemLevel) { CastItemGUID = guid; CastItemId = itemId; CastItemLevel = itemLevel; }
public void SetPeriodicReset(bool reset) { ResetPeriodicTimer = reset; }
public void SetIsRefresh(bool isRefresh) { IsRefresh = isRefresh; }
public void SetStackAmount(int stackAmount) { StackAmount = stackAmount > 0 ? stackAmount : 1; }
public void SetOwnerEffectMask(uint effMask) { _targetEffectMask = effMask; }
public void SetAuraEffectMask(uint effMask) { _auraEffectMask = effMask; }
Source/Game/Spells/Spell.cs
+1 -9
View File
@@ -2354,21 +2354,13 @@ namespace Game.Spells
createInfo.SetCastItem(m_castItemGUID, m_castItemEntry, m_castItemLevel);
createInfo.SetPeriodicReset(resetPeriodicTimer);
createInfo.SetOwnerEffectMask(aura_effmask);
createInfo.SetStackAmount(m_spellValue.AuraStackAmount);
Aura aura = Aura.TryRefreshStackOrCreate(createInfo, false);
if (aura != null)
{
hitInfo.HitAura = aura.ToUnitAura();
// Set aura stack amount to desired value
if (m_spellValue.AuraStackAmount > 1)
{
if (!createInfo.IsRefresh)
hitInfo.HitAura.SetStackAmount((byte)m_spellValue.AuraStackAmount);
else
hitInfo.HitAura.ModStackAmount(m_spellValue.AuraStackAmount);
}
hitInfo.HitAura.SetDiminishGroup(hitInfo.DRGroup);
if (!m_spellValue.Duration.HasValue)