fix(Core/Spells): Implement TrinityCore spell_group and spell_group_stack_rules

data/sql/updates/pending_db_world/rev_1759840412674707391.sql

@@ -0,0 +1,213 @@
+ALTER TABLE `spell_group` DROP `special_flag` ;
+ALTER TABLE `spell_group` MODIFY COLUMN spell_id int;
+
+-- import from trinitycore
+DELETE FROM `spell_group`;
+INSERT INTO `spell_group` (`id`,`spell_id`)
+VALUES (1,2367),(1,2374),(1,3160),(1,3164),(1,7844),(1,8212),(1,10667),(1,10669),(1,11328),(1,11334),(1,11390),(1,11405),(1,11406),(1,11474),(1,16322),(1,16323),(1,16329),(1,17038),(1,17537),(1,17538),(1,17539),(1,17626),(1,17627),(1,17628),(1,17629),(1,21920),(1,26276),(1,28486),(1,28488),(1,28490),(1,28491),(1,28493),(1,28497),(1,28501),(1,28503),(1,28518),(1,28519),(1,28520),(1,28521),(1,28540),(1,33720),(1,33721),(1,33726),(1,38954),(1,40567),(1,40568),(1,40572),(1,40573),(1,40575),(1,40576),(1,41608),(1,41609),(1,41610),(1,41611),(1,42735),(1,45373),(1,46837),(1,46839),(1,53746),(1,53748),(1,53749),(1,53752),(1,53755),(1,53758),(1,53760),(1,54212),(1,54452),(1,54494),(1,60340),(1,60341),(1,60344),(1,60345),(1,60346),(1,62380),(1,63729),(1,67016),(1,67017),(1,67018),
+(2,673),(2,2378),(2,2380),(2,3166),(2,3219),(2,3220),(2,3222),(2,3223),(2,3593),(2,10668),(2,10692),(2,10693),(2,11319),(2,11348),(2,11349),(2,11371),(2,11396),(2,15231),(2,15233),(2,16321),(2,16325),(2,16326),(2,16327),(2,17535),(2,17626),(2,17627),(2,17628),(2,17629),(2,24361),(2,24363),(2,24382),(2,24383),(2,24417),(2,27652),(2,27653),(2,28502),(2,28509),(2,28514),(2,28518),(2,28519),(2,28520),(2,28521),(2,28540),(2,29348),(2,39625),(2,39626),(2,39627),(2,39628),(2,40567),(2,40568),(2,40572),(2,40573),(2,40575),(2,40576),(2,41608),(2,41609),(2,41610),(2,41611),(2,42735),(2,46837),(2,46839),(2,53747),(2,53751),(2,53752),(2,53755),(2,53758),(2,53760),(2,53763),(2,53764),(2,54212),(2,60343),(2,60347),(2,62380),(2,67016),(2,67017),(2,67018),
+(1001,18125),(1001,18141),(1001,19705),(1001,19706),(1001,19708),(1001,19709),(1001,19710),(1001,19711),(1001,20875),(1001,23697),(1001,24799),(1001,24870),(1001,25037),(1001,25694),(1001,25722),(1001,25804),(1001,25941),(1001,33254),(1001,33256),(1001,33257),(1001,33259),(1001,33261),(1001,33263),(1001,33265),(1001,33268),(1001,33272),(1001,35272),(1001,40323),(1001,42293),(1001,43722),(1001,43764),(1001,43771),(1001,44097),(1001,44098),(1001,44099),(1001,44100),(1001,44101),(1001,44102),(1001,44104),(1001,44105),(1001,44106),(1001,45245),(1001,45619),(1001,45694),(1001,46682),(1001,46687),(1001,46899),(1001,53284),(1001,57079),(1001,57097),(1001,57100),(1001,57102),(1001,57107),(1001,57111),(1001,57139),(1001,57286),(1001,57288),(1001,57291),(1001,57294),(1001,57325),(1001,57327),(1001,57329),(1001,57332),(1001,57334),(1001,57356),(1001,57358),(1001,57360),(1001,57363),(1001,57365),(1001,57367),(1001,57371),(1001,57373),(1001,57399),(1001,58468),(1001,58479),(1001,59230),(1001,62349),(1001,64057),(1001,65247),(1001,65365),(1001,65410),(1001,65412),(1001,65414),(1001,65415),(1001,65416),(1001,66623),(1001,66624),(1001,69559),
+(1002,19740),(1002,25782),(1002,56520), -- Blessing of Might
+(1003,6673), -- Battle Shout
+(1004,-1003),(1004,-1002), -- Flap AP Buffs
+(1005,19742),(1005,25894),(1005,56521), -- Blessing of Wisdom
+(1006,20217),(1006,25898),(1006,43223),(1006,56525),(1006,58054),(1006,72586), -- All Stats Percentage
+(1007,20911),(1007,25899), -- Blessing of Sanctuary
+(1008,23415),(1008,41450), -- Blessing of Protection
+(1009,32770), -- Blessing of Light
+(1010,-1009),(1010,-1008),(1010,-1007),(1010,-1006),(1010,-1005),(1010,-1002), -- Blessings
+(1011,-1091),(1011,-1003), -- Warrior Shouts
+(1012,55749), -- Acid Spit
+(1013,8647), -- Expose Armor
+(1014,58567), -- Sunder Armor
+(1015,-1014),(1015,-1013),(1015,-1012), -- Major Armor Debuffs
+(1016,770),(1016,16857), -- Faerie Fire
+(1017,56626), -- Sting
+(1019,-1063),(1019,-1017),(1019,-1016), -- Minor Armor Debuffs
+(1020,55610), -- Icy Talons
+(1021,8515), -- Windfury Totem
+(1022,-1021),(1022,-1020), -- Melee Haste Buffs
+(1023,24932), -- Leader of the Pack
+(1024,29801), -- Rampage
+(1025,-1024),(1025,-1023), -- Physical Crit Buffs
+(1026,53137), -- Abomination's Might'
+(1027,19506), -- Trueshot Aura
+(1028,30802), -- Unleashed Rage
+(1029,-1028),(1029,-1027),(1029,-1026), -- Percentage AP Buffs
+(1030,33878), -- Mangle (Bear)
+(1031,33876), -- Mangle (Cat)
+(1032,46856), -- Trauma
+(1033,-1032),(1033,-1031),(1033,-1030), -- Bleed Debuffs
+(1034,24907), -- Moonkin Aura
+(1035,51466), -- Elemental Oath
+(1036,-1035),(1036,-1034), -- Spell Crit Buffs
+(1037,12579),(1037,17794),(1037,17797),(1037,17798),(1037,17799),(1037,17800),(1037,22959), -- Spell Crit Debuffs
+(1038,-1006),(1038,67480), -- All Stats Percentage with Sanctuary
+-- 1039-44
+(1045,52109), -- Flametongue Totem
+(1046,57658), -- Totem of Wrath
+(1047,48090), -- Demonic Pact
+(1048,-1047),(1048,-1046),(1048,-1045), -- Spell Power Buffs
+-- 1049
+(1050,33196), -- Misery
+(1051,-1050),(1051,-1016), -- Spell Hit Debuffs
+(1052,7294), -- Retribution Aura
+(1053,63531), -- Sanctified Retribution
+(1054,-1053),(1054,-1052),(1054,50170), -- Haste Buffs
+-- 1055
+(1056,-1053),(1056,-1052),(1056,31579),(1056,75593), -- Damage Done Buffs
+(1057,13218), -- Wound Poison
+(1058,-1057),(1058,2818),(1058,3409),(1058,5760),(1058,21183),(1058,30708), -- Crit Taken Debuffs
+(1059,89),(1059,6136),(1059,6343),(1059,6360),(1059,7321),(1059,8042),(1059,16914),(1059,20005),(1059,27648),(1059,51693),(1059,55095),(1059,58179),(1059,68055), -- Attack Speed Debuffs
+(1060,3043),(1060,5570), -- Hit Chance Debuffs
+(1061,-1057),(1061,12294),(1061,19434),(1061,56112), -- Healing Taken Debuffs
+(1062,-1063),(1062,67),(1062,99),(1062,1160), -- AP Debuffs
+(1063,702), -- Curse of Weakness
+(1064,8076), -- Strength of Earth
+(1065,57330), -- Horn of Winter
+(1066,8118), -- Strength Scroll
+(1067,8115), -- Agility Scroll
+(1068,8096), -- Intellect Scroll
+(1069,8099), -- Stamina Scroll
+(1070,8112), -- Spirit Scroll
+(1071,8091), -- Armor Scroll
+(1072,1459), -- Arcane Intellect
+(1073,54424), -- Fel Intelligence
+(1074,1243), -- Power Word: Fortitude
+(1075,21562), -- Prayer of Fortitude
+(1076,14752), -- Divine Spirit
+(1077,27681), -- Prayer of Spirit
+(1078,1126), -- Mark of the Wild
+(1079,21849), -- Gift of the Wild
+(1080,23028), -- Arcane Brilliance
+(1081,61024), -- Dalaran Intellect
+(1082,61316), -- Dalaran Brilliance
+(1083,-1082),(1083,-1081),(1083,-1080),(1083,-1072),(1083,-1068), -- Mage Intellect Buffs
+(1084,-1075),(1084,-1074),(1084,-1069),(1084,72590), -- Priest Stamina Buffs
+(1085,-1077),(1085,-1076),(1085,-1070), -- Priest Spirit Buffs
+(1086,-1071),(1086,8072), -- Armor Buffs
+(1087,-1071),(1087,-1070),(1087,-1069),(1087,-1068),(1087,-1067),(1087,-1066),-- Scrolls
+(1088,-1065),(1088,-1064), -- Strength and Agility Buffs
+(1091,469), -- Commanding Shout
+(1092,6307), -- Blood Pact
+(1093,-1092),(1093,-1091), -- HP Buffs
+(1094,34123),(1094,63514), -- Healing Taken Buffs
+(1095,14893),(1095,16177), -- Physical Taken Buffs
+(1096,1714),(1096,5760),(1096,31589), -- Cast Time Debuffs
+(1097,122),(1097,33395),(1097,55080), -- Frost Novas
+(1098,976),(1098,27683), -- Shadow Protection
+(1099,348),(1099,30108), -- Immolate and Unstable Affliction
+(1100,604),(1100,1008), -- Dampen/Amplify Magic
+(1101,1490),(1101,51726),(1101,60431), -- Spell Damage Taken Debuffs
+(1102,40055),(1102,40165),(1102,40166),(1102,40167), -- Introspection
+(1103,40623),(1103,40625),(1103,40626), -- Apexis Movement Speed
+(1104,12880),(1104,57514),(1104,57518), -- Warrior Enrages
+(1105,-1005),(1105,5677), -- MP5 Buffs
+(1106,6562),(1106,28878), -- Heroic Presence
+(1107,12042),(1107,12292),(1107,31884),(1107,34471),(1107,49016),(1107,57933), -- Temporary Damage Increases
+(1108,30069),(1108,58684), -- Phys Damage Taken Debuffs
+(1110,74826),(1110,74827),(1110,74828),(1110,74829),(1110,74830),(1110,74831),(1110,74832),(1110,74833),(1110,74834),(1110,74835),(1110,74836), -- Corporeality
+(1111,62727),(1111,63438),(1111,63439),(1111,63440),(1111,63441),(1111,63442),(1111,63443),(1111,63444),(1111,63445),(1111,63446), -- Champion's Pennant
+(1112,8219),(1112,8220),(1112,8221),(1112,8222), -- Flip Out
+-- 1116-20
+(1121,3671),(1121,3672),(1121,3673), -- Elemental Slave Buffs
+(1122,2825),(1122,10060),(1122,32182), -- Temporary Haste Buffs
+(1123,10060),(1123,12042), -- Power Infusion and Arcane Power
+(1124,-1085),(1124,-1073), -- Intellect Buffs
+(1125,-1083),(1125,-1073), -- Spirit Buffs
+
+-- values missing from trinitycore
+(1,33053), -- Crawdad Flask
+(1001,5020),(1001,5021),(1001,5257),(1001,6114),(1001,15852),(1001,18191),(1001,18192),(1001,18193),(1001,18194),(1001,18222),(1001,22730),(1001,22789),(1001,25661),(1001,37058),(1001,43730), -- More Foods
+(1006, 26393), -- Elune's Blessing'
+(1062, 24423), -- Demoralizing Screech
+(1019, 50274), -- Spore Cloud
+(1022, 23060), -- Battle Squawk
+-- (1058, 45176), -- Server Side Master Poisoner (is it needed?)
+(1084, 23947), (1084, 23948), -- NPC Power Word Fortitude
+(1096,35387), -- Poison Spit
+(1096,58604), -- Lava Breath
+(1089,-1079),(1089,-1078),(1089,72588), (1089,16878),(1089,24752),(1089,39233), -- Mark of the Wild
+(1107,48391), -- Owlkin Frenzy
+(1090, 7481), (1090,7483), (1090,7484), -- Howling Rage
+(1113, 467), -- Thorns
+(1114,70233),(1114,70234),(1114,70235),(1114,70242),(1114,70243),(1114,70244), -- Perfumes/Colognes
+(1115,46302), -- K'iru's Song of Victory
+(1126,-1115),(1126,-1084), --  Stamina Buffs
+(1124,-1115); -- Intellect Buffs
+
+DELETE FROM `spell_group_stack_rules`;
+INSERT INTO `spell_group_stack_rules` (`group_id`,`stack_rule`, `description`) VALUES
+(1,1,"Battle Elixir"),
+(2,1, "Guardian Elixir"),
+(1001,1, "Well Fed"),
+(1002,4, "Blessing of Might"),
+(1003,4, "Battle Shout"),
+(1004,4, "Flat AP Buffs"),
+(1005,4, "Blessing of Wisdom"),
+(1006,1, "All Stats Percentage"),
+(1007,1, "Blessing of Sanctuary"),
+(1008,1, "Blessing of Protection"),
+(1009,1, "Blessing of Light"),
+(1010,2, "Blessings"),
+(1011,2, "Warrior Shouts"),
+(1015,3, "Major Armor Debuffs"),
+(1016,4, "Faerie Fire"),
+(1019,3, "Minor Armor Debuffs"),
+(1022,3, "Melee Haste Buffs"),
+(1023,4, "Leader of the Pack"),
+(1024,4, "Rampage"),
+(1025,3, "Physical Crit Buffs"),
+(1029,1, "Percentage AP Buffs"),
+(1033,1, "Bleed Debuffs"),
+(1036,4, "Spell Crit Buffs"),
+(1037,3, "Spell Crit Debuffs"),
+(1038,3, "All Stats Percentage with Sanctuary"),
+(1046,4, "Totem of Wrath"),
+(1048,4, "Spell Power Buffs"),
+(1051,3, "Spell Hit Debuffs"),
+(1054,3, "Haste Buffs"),
+(1056,3, "Damage Done Buffs"),
+(1058,3, "Poisons"),
+(1059,3, "Attack Speed Debuffs"),
+(1060,3, "Hit Chance Debuffs"),
+(1061,4, "Healing Taken Debuffs"),
+(1062,4, "AP Debuffs"),
+(1083,4, "Single Intellect Buffs"),
+(1084,4, "Single Stamina Buffs"),
+(1085,4, "Single Spirit Buffs"),
+(1086,4, "Armor Buffs"),
+(1087,4, "Scrolls"),
+(1088,4, "Strength and Agility Buffs"),
+(1091,0, "Commanding Shout"),
+(1092,0, "Blood Pact"),
+(1093,4, "Flat HP Buffs"),
+(1094,3, "Healing Taken Buffs"),
+(1095,4, "Physical Taken Buffs"),
+(1096,4, "Cast Time Debuffs"),
+(1097,1, "Frost Novals"),
+(1098,4, "Shadow Protection"),
+(1099,2, "Immolate and Unstable Affliction"),
+(1100,1, "Dampen/Amplify Magic"),
+(1101,3, "Spell Damage Taken Debuffs"),
+(1104,1, "Warrior Enrages"),
+(1105,3, "MP5 Buffs"),
+(1106,1, "Heroic Presence"),
+(1107,4, "Temporary Damage Increases"),
+(1108,4, "Phys Damage Taken Debuffs"),
+(1110,1, "Corporeality"),
+(1111,1, "Champion's Pennants'"),
+(1112,1, "Flip Out"),
+(1121,1, "Elemental Slave Buffs"),
+(1122,4, "Temporary Haste Buffs"),
+(1123,1, "Power Infusion and Arcane Power"),
+(1124,3, "Intellect Buffs"),
+(1125,3, "Spirit Buffs"),
+
+-- additions
+(1089,4, "Mark of the Wild"),
+(1113,4, "Thorns"),
+(1126,3, "Stamina Buffs");
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (18735,56247);
+INSERT INTO `spell_script_names` VALUES (18735,"spell_warl_voidwalker_pet_passive"); 

src/server/game/Entities/Creature/Creature.cpp

@@ -38,6 +38,7 @@
 #include "PoolMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedGossip.h"
+#include "SpellAuraDefines.h"
 #include "SpellAuraEffects.h"
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
@@ -1017,10 +1018,7 @@ void Creature::Regenerate(Powers power)
     }
 
     // Apply modifiers (if any).
-    AuraEffectList const& ModPowerRegenPCTAuras = GetAuraEffectsByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
-    for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
-        if (Powers((*i)->GetMiscValue()) == power)
-            AddPct(addvalue, (*i)->GetAmount());
+    addvalue *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, power);
 
     addvalue += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, power) * (power == POWER_FOCUS ? PET_FOCUS_REGEN_INTERVAL.count() : CREATURE_REGEN_INTERVAL) / (5 * IN_MILLISECONDS);
 
@@ -1056,9 +1054,7 @@ void Creature::RegenerateHealth()
     }
 
     // Apply modifiers (if any).
-    AuraEffectList const& ModPowerRegenPCTAuras = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
-    for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
-        AddPct(addvalue, (*i)->GetAmount());
+    addvalue *= GetTotalAuraMultiplier(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
 
     addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * CREATURE_REGEN_INTERVAL  / (5 * IN_MILLISECONDS);
 

src/server/game/Entities/Pet/Pet.cpp

@@ -1182,14 +1182,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
                                 HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_PCT, aurEff->GetAmount(), true);
                             }
 
-                            break;
-                        }
-                    case NPC_VOIDWALKER:
-                        {
-                            if (AuraEffect* aurEff = owner->GetAuraEffectDummy(SPELL_GLYPH_OF_VOIDWALKER))
-                            {
-                                HandleStatModifier(UNIT_MOD_STAT_STAMINA, TOTAL_PCT, aurEff->GetAmount(), true);
-                            }
                             break;
                         }
                     case NPC_WATER_ELEMENTAL_PERM:

src/server/game/Entities/Player/KillRewarder.cpp

@@ -21,6 +21,7 @@
 #include "Pet.h"
 #include "Player.h"
 #include "ScriptMgr.h"
+#include "SpellAuraDefines.h"
 #include "SpellAuraEffects.h"
 
 // KillRewarder incapsulates logic of rewarding player upon kill with:
@@ -162,9 +163,7 @@ void KillRewarder::_RewardXP(Player* player, float rate)
     if (xp)
     {
         // 4.2.2. Apply auras modifying rewarded XP (SPELL_AURA_MOD_XP_PCT).
-        Unit::AuraEffectList const& auras = player->GetAuraEffectsByType(SPELL_AURA_MOD_XP_PCT);
-        for (Unit::AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i)
-            AddPct(xp, (*i)->GetAmount());
+        xp *= player->GetTotalAuraMultiplier(SPELL_AURA_MOD_XP_PCT);
 
         // 4.2.3. Give XP to player.
         sScriptMgr->OnPlayerGiveXP(player, xp, _victim, PlayerXPSource::XPSOURCE_KILL);

src/server/game/Entities/Player/Player.cpp

@@ -71,6 +71,7 @@
 #include "ScriptMgr.h"
 #include "SocialMgr.h"
 #include "Spell.h"
+#include "SpellAuraDefines.h"
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
@@ -826,9 +827,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
                 if (!IsAlive() || HasWaterBreathingAura() || GetSession()->GetSecurity() >= AccountTypes(sWorld->getIntConfig(CONFIG_DISABLE_BREATHING)))
                     return DISABLED_MIRROR_TIMER;
                 int32 UnderWaterTime = sWorld->getIntConfig(CONFIG_WATER_BREATH_TIMER);
-                AuraEffectList const& mModWaterBreathing = GetAuraEffectsByType(SPELL_AURA_MOD_WATER_BREATHING);
-                for (AuraEffectList::const_iterator i = mModWaterBreathing.begin(); i != mModWaterBreathing.end(); ++i)
-                    AddPct(UnderWaterTime, (*i)->GetAmount());
+                UnderWaterTime *= GetTotalAuraMultiplier(SPELL_AURA_MOD_WATER_BREATHING);
                 return UnderWaterTime;
             }
         case FIRE_TIMER:
@@ -1937,10 +1936,7 @@ void Player::Regenerate(Powers power)
     // Mana regen calculated in Player::UpdateManaRegen(), energy regen calculated in Player::UpdateEnergyRegen()
     if (power != POWER_MANA && power != POWER_ENERGY)
     {
-        AuraEffectList const& ModPowerRegenPCTAuras = GetAuraEffectsByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
-        for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
-            if (Powers((*i)->GetMiscValue()) == power)
-                AddPct(addvalue, (*i)->GetAmount());
+        addvalue *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, power);
 
         // Butchery requires combat for this effect
         if (power != POWER_RUNIC_POWER || IsInCombat())
@@ -2023,11 +2019,7 @@ void Player::RegenerateHealth()
             addvalue *= 1.33f;
         }
 
-        AuraEffectList const& mModHealthRegenPct = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
-        for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
-        {
-            AddPct(addvalue, (*i)->GetAmount());
-        }
+        addvalue *= GetTotalAuraMultiplier(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
 
         if (!IsInCombat())
         {
@@ -7085,6 +7077,7 @@ SpellSchoolMask Player::GetMeleeDamageSchoolMask(WeaponAttackType attackType /*=
     return SPELL_SCHOOL_MASK_NORMAL;
 }
 
+// @todoooo
 void Player::_ApplyWeaponDependentAuraMods(Item* item, WeaponAttackType attackType, bool apply)
 {
     AuraEffectList const& auraCritList = GetAuraEffectsByType(SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
@@ -7503,12 +7496,6 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8
             continue;
         }
 
-        if (!spellInfo->CheckElixirStacking(this))
-        {
-            Spell::SendCastResult(this, spellInfo, cast_count, SPELL_FAILED_AURA_BOUNCED);
-            continue;
-        }
-
         Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE);
         spell->m_CastItem = item;
         spell->m_cast_count = cast_count;                   // set count of casts

src/server/game/Entities/Player/PlayerQuest.cpp

@@ -1405,9 +1405,7 @@ uint32 Player::CalculateQuestRewardXP(Quest const* quest)
     uint32 xp = uint32(quest->XPValue(GetLevel()) * GetQuestRate(quest->IsDFQuest()));
 
     // handle SPELL_AURA_MOD_XP_QUEST_PCT auras
-    Unit::AuraEffectList const& ModXPPctAuras = GetAuraEffectsByType(SPELL_AURA_MOD_XP_QUEST_PCT);
-    for (Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin(); i != ModXPPctAuras.end(); ++i)
-        AddPct(xp, (*i)->GetAmount());
+    xp *= GetTotalAuraMultiplier(SPELL_AURA_MOD_XP_QUEST_PCT);
 
     return xp;
 }

src/server/game/Entities/Unit/StatSystem.cpp

@@ -849,7 +849,7 @@ void Player::UpdateSpellCritChance(uint32 school)
     // Crit from Intellect
     crit += GetSpellCritFromIntellect();
     // Increase crit from SPELL_AURA_MOD_SPELL_CRIT_CHANCE
-    crit += GetTotalAuraModifierAreaExclusive(SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
+    crit += GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
     // Increase crit from SPELL_AURA_MOD_CRIT_PCT
     crit += GetTotalAuraModifier(SPELL_AURA_MOD_CRIT_PCT);
     // Increase crit by school from SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL
@@ -900,16 +900,11 @@ void Player::UpdateExpertise(WeaponAttackType attack)
 
     Item* weapon = GetWeaponForAttack(attack, true);
 
-    AuraEffectList const& expAuras = GetAuraEffectsByType(SPELL_AURA_MOD_EXPERTISE);
-    for (AuraEffectList::const_iterator itr = expAuras.begin(); itr != expAuras.end(); ++itr)
+    expertise += GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE, [weapon](AuraEffect const* aurEff)
     {
-        // item neutral spell
-        if ((*itr)->GetSpellInfo()->EquippedItemClass == -1)
-            expertise += (*itr)->GetAmount();
-        // item dependent spell
-        else if (weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellInfo()))
-            expertise += (*itr)->GetAmount();
-    }
+        return aurEff->GetSpellInfo()->EquippedItemClass == -1 || // item neutral spell
+            (weapon && weapon->IsFitToSpellRequirements(aurEff->GetSpellInfo())); // item dependent spell
+    });
 
     if (expertise < 0)
         expertise = 0;