Author: reeshack <richard.galis@gmail.com>  2010-11-30 16:50:53
Committer: reeshack <richard.galis@gmail.com>  2010-11-30 16:50:53
Parent: d11a2b6907c44995452125e293c879b476ae7e7e (typo)
Branches: master, remotes/origin/master
Follows: 333a
Precedes:

    [pr980] Handle weapon switch gcd by casting the cooldown spell

    Signed-off-by: reeshack <richard.galis@gmail.com>

----------------------------- src/game/Player.cpp -----------------------------
index 5562d9f..b24d3f1 100644
@@ -11393,13 +11393,14 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
                     sLog.outError("Weapon switch cooldown spell %u couldn't be found in Spell.dbc", cooldownSpell);
                 else
                 {
-
-                    WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4);
+
+                    CastSpell(this,cooldownSpell,false);
+                    /*WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4);
                     data << uint64(GetGUID());
                     data << uint8(1);
                     data << uint32(cooldownSpell);
                     data << uint32(0);
-                    GetSession()->SendPacket(&data);
+                    GetSession()->SendPacket(&data);*/
                 }
             }
         }
@@ -11597,12 +11598,13 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
                             else
                             {

-                                WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4);
+                                CastSpell(this,cooldownSpell,false);
+                                /*WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4);
                                 data << uint64(GetGUID());
                                 data << uint8(1);
                                 data << uint32(cooldownSpell);
                                 data << uint32(0);
-                                GetSession()->SendPacket(&data);
+                                GetSession()->SendPacket(&data);*/
                             }
                         }
                     }

--------------------------- src/shared/revision_nr.h ---------------------------
index 140c99e..97dd467 100644
@@ -1,6 +1,6 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
  #define REVISION_NR "10707"
- #define REVISION_VP "pr979"
+ #define REVISION_VP "pr980"
  #define REVISION_VP_DATE "30.11.2010"
 #endif // __REVISION_NR_H__