From 93eda20d5cf6eeb34e1aee1b81469ba6e8fa7f0c Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 26 Feb 2018 22:37:06 -0300 Subject: Core/Spells: Fix periodic rolling adding bonuses twice Calculation is now done in CalculateAmount --- src/server/game/Spells/SpellMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Spells/SpellMgr.cpp') diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index bea1c1b5da3..cc6812a0ea8 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -21,6 +21,7 @@ #include "BattlefieldWG.h" #include "BattlegroundMgr.h" #include "Chat.h" +#include "Containers.h" #include "DatabaseEnv.h" #include "DBCStores.h" #include "Log.h" @@ -640,10 +641,9 @@ bool SpellMgr::IsArenaAllowedEnchancment(uint32 ench_id) const return mEnchantCustomAttr[ench_id]; } -const std::vector* SpellMgr::GetSpellLinked(int32 spell_id) const +std::vector const* SpellMgr::GetSpellLinked(int32 spell_id) const { - SpellLinkedMap::const_iterator itr = mSpellLinkedMap.find(spell_id); - return itr != mSpellLinkedMap.end() ? &(itr->second) : nullptr; + return Trinity::Containers::MapGetValuePtr(mSpellLinkedMap, spell_id); } PetLevelupSpellSet const* SpellMgr::GetPetLevelupSpellList(uint32 petFamily) const -- cgit v1.2.3