From b955dc395c53f29e09d7bcc26f48d273729008e4 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Mon, 19 Jul 2010 02:20:09 +0200
Subject: Send SMSG_LEARNED_SPELL before relearning or respeccing disabled
 spells/talents (fix by Vladimir) (Ensures proper ordering when attempting to
 learn higher ranked/disabled spells/talents)

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 9c63c2f73c8..3470e55b8cd 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3536,6 +3536,15 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
 
     bool learning = addSpell(spell_id,active,true,dependent,false);
 
+    // prevent duplicated entires in spell book, also not send if not in world (loading)
+    if (learning || IsInWorld())
+    {
+        WorldPacket data(SMSG_LEARNED_SPELL, 6);
+        data << uint32(spell_id);
+        data << uint16(0);
+        GetSession()->SendPacket(&data);
+    }
+
     // learn all disabled higher ranks and required spells (recursive)
     if (disabled)
     {
@@ -3555,15 +3564,6 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
                 learnSpell(itr2->second, false);
         }
     }
-
-    // prevent duplicated entires in spell book, also not send if not in world (loading)
-    if (!learning || !IsInWorld())
-        return;
-
-    WorldPacket data(SMSG_LEARNED_SPELL, 6);
-    data << uint32(spell_id);
-    data << uint16(0);
-    GetSession()->SendPacket(&data);
 }
 
 void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
-- 
cgit v1.2.3