From 30adff16ae8806b7d5df824b6d3fdd331f7ff233 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 6 Jan 2023 16:51:01 +0100 Subject: Core/Utils: Replace boost flat_set with our own (cherry picked from commit 42fbcf2fc58690346ef1db12803b79634985d44f) --- src/server/game/Spells/SpellInfo.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index dd3c8ede288..1cd54720d54 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -20,6 +20,7 @@ #include "Corpse.h" #include "Creature.h" #include "DBCStores.h" +#include "FlatSet.h" #include "Item.h" #include "ItemTemplate.h" #include "Log.h" @@ -30,7 +31,6 @@ #include "SpellAuraEffects.h" #include "SpellMgr.h" #include "Vehicle.h" -#include uint32 GetTargetFlagMask(SpellTargetObjectTypes objType) { @@ -228,8 +228,8 @@ struct SpellEffectInfo::ImmunityInfo uint32 DispelImmune = 0; uint32 DamageSchoolMask = 0; - boost::container::flat_set AuraTypeImmune; - boost::container::flat_set SpellEffectImmune; + Trinity::Containers::FlatSet AuraTypeImmune; + Trinity::Containers::FlatSet SpellEffectImmune; }; std::array SpellImplicitTargetInfo::_data = @@ -3004,7 +3004,7 @@ bool SpellInfo::CanSpellProvideImmunityAgainstAura(SpellInfo const* auraSpellInf continue; auto spellImmuneItr = immuneInfo->SpellEffectImmune.find(auraSpellEffectInfo.Effect); - if (spellImmuneItr == immuneInfo->SpellEffectImmune.cend()) + if (spellImmuneItr == immuneInfo->SpellEffectImmune.end()) { immuneToAllEffects = false; break; @@ -3025,7 +3025,7 @@ bool SpellInfo::CanSpellProvideImmunityAgainstAura(SpellInfo const* auraSpellInf { bool isImmuneToAuraEffectApply = false; auto auraImmuneItr = immuneInfo->AuraTypeImmune.find(auraName); - if (auraImmuneItr != immuneInfo->AuraTypeImmune.cend()) + if (auraImmuneItr != immuneInfo->AuraTypeImmune.end()) isImmuneToAuraEffectApply = true; if (!isImmuneToAuraEffectApply && !auraSpellInfo->IsPositiveEffect(auraSpellEffectInfo.EffectIndex) && !auraSpellInfo->HasAttribute(SPELL_ATTR2_UNAFFECTED_BY_AURA_SCHOOL_IMMUNE)) -- cgit v1.2.3