diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-01-09 13:23:48 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-01-09 13:23:48 +0100 |
| commit | 97f58a59f13fcf3a8a6675215674fb89b1a136ca (patch) | |
| tree | bc5b845fe576728760b088e0039438f9a116ba0a /src/server/game/Entities/Unit | |
| parent | 0a1b81043eaae0e0feba2b693e1f004ac4791c30 (diff) | |
Core/Auras: Make iteration over Aura::GetAuraEffects safe by automatically skipping nullptr elements
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/StatSystem.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 4067c41a05c..bedb30bf968 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -556,9 +556,6 @@ void Player::UpdateMastery() { for (AuraEffect* auraEff : aura->GetAuraEffects()) { - if (!auraEff) - continue; - float mult = auraEff->GetSpellEffectInfo().BonusCoefficient; if (G3D::fuzzyEq(mult, 0.0f)) continue; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 73167038f7b..89c1afbeae4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13888,13 +13888,8 @@ int32 Unit::GetHighestExclusiveSameEffectSpellGroupValue(AuraEffect const* aurEf bool Unit::IsHighestExclusiveAura(Aura const* aura, bool removeOtherAuraApplications /*= false*/) { for (AuraEffect const* aurEff : aura->GetAuraEffects()) - { - if (!aurEff) - continue; - if (!IsHighestExclusiveAuraEffect(aura->GetSpellInfo(), aurEff->GetAuraType(), aurEff->GetAmount(), aura->GetEffectMask(), removeOtherAuraApplications)) return false; - } return true; } |
