*Fix the immediate crash during startup.

--HG--
branch : trunk

1 files changed, 9 insertions, 9 deletions

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 53683a6ebdc..2863e19fe9d 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2265,15 +2265,6 @@ void SpellMgr::LoadSpellLinked()
             continue;
         }
 
-        if(type) //we will find a better way when more types are needed
-        {
-            if(trigger > 0)
-                trigger += SPELL_LINKED_MAX_SPELLS * type;
-            else
-                trigger -= SPELL_LINKED_MAX_SPELLS * type;
-        }
-        mSpellLinkedMap[trigger].push_back(effect);
-
         if(trigger > 0)
         {
             switch(type)
@@ -2288,6 +2279,15 @@ void SpellMgr::LoadSpellLinked()
             mSpellCustomAttr[-trigger] |= SPELL_ATTR_CU_LINK_REMOVE;
         }
 
+        if(type) //we will find a better way when more types are needed
+        {
+            if(trigger > 0)
+                trigger += SPELL_LINKED_MAX_SPELLS * type;
+            else
+                trigger -= SPELL_LINKED_MAX_SPELLS * type;
+        }
+        mSpellLinkedMap[trigger].push_back(effect);
+
         ++count;
     } while( result->NextRow() );