* Correctly remove two-handed weapon in off-hand slot when intended. (Talent reset if configured, switch talent spec)

--HG--
branch : trunk

1 files changed, 8 insertions, 9 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 40dc8b21c62..c1db42267fc 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -3559,7 +3559,14 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
             }
         }
     }
-
+    
+    if(spell_id == 46917 && m_canTitanGrip)
+    {
+        SetCanTitanGrip(false);
+        if(sWorld.getConfig(CONFIG_OFFHAND_CHECK_AT_TALENTS_RESET))
+            AutoUnequipOffhandIfNeed();
+    }
+    
     // remove from spell book if not replaced by lesser rank
     if(!prev_activate)
     {
@@ -3831,14 +3838,6 @@ bool Player::resetTalents(bool no_cost)
     }
     */
 
-
-    if(m_canTitanGrip)
-    {
-        m_canTitanGrip = false;
-        if(sWorld.getConfig(CONFIG_OFFHAND_CHECK_AT_TALENTS_RESET))
-            AutoUnequipOffhandIfNeed();
-    }
-
     return true;
 }