aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2013-07-30 15:27:24 +0100
committerNay <dnpd.dd@gmail.com>2013-07-30 15:27:24 +0100
commit7cb1b21f5ec579f174e1adc5b5f526e047e6a7be (patch)
treee61054f875c291f78c2d99c32ee02250130323e7 /src
parentb21fe684c1534724130efa03086060dc2b27558b (diff)
Core/Spells: Fix a merge error
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index fc28b1127df..95e25e2b03a 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -2761,11 +2761,13 @@ void SpellMgr::LoadSpellInfoStore()
std::map<uint32, SpellEffectArray> effectsBySpell;
for (uint32 i = 0; i < sSpellEffectStore.GetNumRows(); ++i)
+ {
SpellEffectEntry const* effect = sSpellEffectStore.LookupEntry(i);
if (!effect)
continue;
effectsBySpell[effect->EffectSpellId].effects[effect->EffectIndex] = effect;
+ }
for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i)
if (SpellEntry const* spellEntry = sSpellStore.LookupEntry(i))