Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Replace MAX_SPELL_EFFECTS loop limits with correct upper bound depending on how many effects the spell has v2

Browse Source
This commit is contained in:
Shauren
2025-06-03 10:36:41 +02:00
parent 964647ebec
commit 9ad1ab6c57
1 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -3524,10 +3524,14 @@ void Unit::_ApplyAura(AuraApplication* aurApp, uint32 effMask)
aura->HandleAuraSpecificMods(aurApp, caster, true, false);
// apply effects of the aura
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
for (AuraEffect const* aurEff : aura->GetAuraEffects())
{
if (effMask & 1 << i && (!aurApp->GetRemoveMode()))
aurApp->_HandleEffect(i, true);
if (effMask & 1 << aurEff->GetEffIndex())
{
aurApp->_HandleEffect(aurEff->GetEffIndex(), true);
if (aurApp->GetRemoveMode())
break;
}
}
if (Player* player = ToPlayer())
@@ -3593,11 +3597,9 @@ void Unit::_UnapplyAura(AuraApplicationMap::iterator& i, AuraRemoveMode removeMo
aura->_UnapplyForTarget(this, caster, aurApp);
// remove effects of the spell - needs to be done after removing aura from lists
for (uint8 itr = 0; itr < MAX_SPELL_EFFECTS; ++itr)
{
if (aurApp->HasEffect(itr))
aurApp->_HandleEffect(itr, false);
}
for (AuraEffect const* aurEff : aura->GetAuraEffects())
if (aurApp->HasEffect(aurEff->GetEffIndex()))
aurApp->_HandleEffect(aurEff->GetEffIndex(), false);
// all effect mustn't be applied
ASSERT(!aurApp->GetEffectMask());
@@ -3809,10 +3811,10 @@ void Unit::RemoveAura(AuraApplication * aurApp, AuraRemoveMode mode)
if (aurApp->GetRemoveMode())
{
// remove remaining effects of an aura
for (uint8 itr = 0; itr < MAX_SPELL_EFFECTS; ++itr)
for (AuraEffect const* aurEff : aurApp->GetBase()->GetAuraEffects())
{
if (aurApp->HasEffect(itr))
aurApp->_HandleEffect(itr, false);
if (aurApp->HasEffect(aurEff->GetEffIndex()))
aurApp->_HandleEffect(aurEff->GetEffIndex(), false);
}
return;
}
@@ -3985,26 +3987,19 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGUID, W
Aura* aura = iter->second;
if (aura->GetCasterGUID() == casterGUID)
{
int32 damage[MAX_SPELL_EFFECTS];
int32 baseDamage[MAX_SPELL_EFFECTS];
uint32 effMask = 0;
uint32 recalculateMask = 0;
std::array<int32, MAX_SPELL_EFFECTS> damage = { };
std::array<int32, MAX_SPELL_EFFECTS> baseDamage = { };
std::bitset<MAX_SPELL_EFFECTS> effMask;
std::bitset<MAX_SPELL_EFFECTS> recalculateMask;
Unit* caster = aura->GetCaster();
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
for (AuraEffect const* aurEff : aura->GetAuraEffects())
{
if (aura->GetEffect(i))
{
baseDamage[i] = aura->GetEffect(i)->GetBaseAmount();
damage[i] = aura->GetEffect(i)->GetAmount();
effMask |= 1 << i;
if (aura->GetEffect(i)->CanBeRecalculated())
recalculateMask |= 1 << i;
}
else
{
baseDamage[i] = 0;
damage[i] = 0;
}
SpellEffIndex i = aurEff->GetEffIndex();
baseDamage[i] = aurEff->GetBaseAmount();
damage[i] = aurEff->GetAmount();
effMask[i] = true;
if (aurEff->CanBeRecalculated())
recalculateMask[i] = true;
}
bool stealCharge = aura->GetSpellInfo()->HasAttribute(SPELL_ATTR7_DISPEL_REMOVES_CHARGES);
@@ -4027,10 +4022,10 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGUID, W
if (aura->IsSingleTarget())
aura->UnregisterSingleTarget();
AuraCreateInfo createInfo(aura->GetCastId(), aura->GetSpellInfo(), aura->GetCastDifficulty(), effMask, unitStealer);
AuraCreateInfo createInfo(aura->GetCastId(), aura->GetSpellInfo(), aura->GetCastDifficulty(), effMask.to_ulong(), unitStealer);
createInfo
.SetCasterGUID(aura->GetCasterGUID())
.SetBaseAmount(baseDamage)
.SetBaseAmount(baseDamage.data())
.SetStackAmount(stolenCharges);
if (Aura* newAura = Aura::TryRefreshStackOrCreate(createInfo))
@@ -4044,7 +4039,7 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, ObjectGuid casterGUID, W
caster->GetSingleCastAuras().push_front(aura);
}
// FIXME: using aura->GetMaxDuration() maybe not blizzlike but it fixes stealing of spells like Innervate
newAura->SetLoadedState(aura->GetMaxDuration(), int32(dur), stealCharge ? stolenCharges : aura->GetCharges(), recalculateMask, &damage[0]);
newAura->SetLoadedState(aura->GetMaxDuration(), int32(dur), stealCharge ? stolenCharges : aura->GetCharges(), recalculateMask.to_ulong(), damage.data());
newAura->ApplyForTargets();
}
}
@@ -12508,7 +12503,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId, uint32 spellId, TriggerC
}
else // This can happen during Player::_LoadAuras
{
int32 bp[MAX_SPELL_EFFECTS] = { };
std::array<int32, MAX_SPELL_EFFECTS> bp = { };
for (SpellEffectInfo const& spellEffectInfo : spellEntry->GetEffects())
bp[spellEffectInfo.EffectIndex] = int32(spellEffectInfo.BasePoints);
@@ -12517,7 +12512,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId, uint32 spellId, TriggerC
AuraCreateInfo createInfo(ObjectGuid::Create<HighGuid::Cast>(SPELL_CAST_SOURCE_NORMAL, GetMapId(), spellEntry->Id, GetMap()->GenerateLowGuid<HighGuid::Cast>()), spellEntry, GetMap()->GetDifficultyID(), MAX_EFFECT_MASK, this);
createInfo
.SetCaster(clicker)
.SetBaseAmount(bp)
.SetBaseAmount(bp.data())
.SetCasterGUID(origCasterGUID);
Aura::TryRefreshStackOrCreate(createInfo);
@@ -13958,8 +13953,10 @@ bool Unit::IsHighestExclusiveAuraEffect(SpellInfo const* spellInfo, AuraType aur
{
int64 diff = int64(abs(effectAmount)) - int64(abs(existingAurEff->GetAmount()));
if (!diff)
for (int32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
diff += int64((auraEffectMask & (1 << i)) >> i) - int64((existingAurEff->GetBase()->GetEffectMask() & (1 << i)) >> i);
{
// treat the aura with more effects as stronger
diff = std::popcount(auraEffectMask) - std::popcount(existingAurEff->GetBase()->GetEffectMask());
}
if (diff > 0)
{