diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-02-26 22:37:06 -0300 |
|---|---|---|
| committer | Ariel Silva <ariel-@users.noreply.github.com> | 2018-03-09 14:41:28 -0300 |
| commit | 93eda20d5cf6eeb34e1aee1b81469ba6e8fa7f0c (patch) | |
| tree | c6c8e98124c667756f013b8e1ab16f6a9c0159a1 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 45c5e1b9d63796d168339a44f63418f220cf2403 (diff) | |
Core/Spells: Fix periodic rolling adding bonuses twice
Calculation is now done in CalculateAmount
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<int32>* SpellMgr::GetSpellLinked(int32 spell_id) const +std::vector<int32> 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 |