1 files changed, 46 insertions, 38 deletions

diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index b17cff78d7d..31720266ff0 100755
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -29,13 +29,13 @@
 #include "SpellInfo.h"
 #include <vector>
 
-void WorldSession::HandleSplitItemOpcode(WorldPacket & recv_data)
+void WorldSession::HandleSplitItemOpcode(WorldPacket & recvData)
 {
     //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_SPLIT_ITEM");
     uint8 srcbag, srcslot, dstbag, dstslot;
     uint32 count;
 
-    recv_data >> srcbag >> srcslot >> dstbag >> dstslot >> count;
+    recvData >> srcbag >> srcslot >> dstbag >> dstslot >> count;
     //sLog->outDebug("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u, count = %u", srcbag, srcslot, dstbag, dstslot, count);
 
     uint16 src = ((srcbag << 8) | srcslot);
@@ -62,12 +62,12 @@ void WorldSession::HandleSplitItemOpcode(WorldPacket & recv_data)
     _player->SplitItem(src, dst, count);
 }
 
-void WorldSession::HandleSwapInvItemOpcode(WorldPacket & recv_data)
+void WorldSession::HandleSwapInvItemOpcode(WorldPacket & recvData)
 {
     //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_SWAP_INV_ITEM");
     uint8 srcslot, dstslot;
 
-    recv_data >> dstslot >> srcslot;
+    recvData >> dstslot >> srcslot;
     //sLog->outDebug("STORAGE: receive srcslot = %u, dstslot = %u", srcslot, dstslot);
 
     // prevent attempt swap same item to current position generated by client at special checting sequence
@@ -92,11 +92,11 @@ void WorldSession::HandleSwapInvItemOpcode(WorldPacket & recv_data)
     _player->SwapItem(src, dst);
 }
 
-void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket& recv_data)
+void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket& recvData)
 {
     uint64 itemguid;
     uint8 dstslot;
-    recv_data >> itemguid >> dstslot;
+    recvData >> itemguid >> dstslot;
 
     // cheating attempt, client should never send opcode in that case
     if (!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, dstslot))
@@ -111,12 +111,12 @@ void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket& recv_data)
     _player->SwapItem(item->GetPos(), dstpos);
 }
 
-void WorldSession::HandleSwapItem(WorldPacket & recv_data)
+void WorldSession::HandleSwapItem(WorldPacket & recvData)
 {
     //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_SWAP_ITEM");
     uint8 dstbag, dstslot, srcbag, srcslot;
 
-    recv_data >> dstbag >> dstslot >> srcbag >> srcslot;
+    recvData >> dstbag >> dstslot >> srcbag >> srcslot;
     //sLog->outDebug("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u", srcbag, srcslot, dstbag, dstslot);
 
     uint16 src = ((srcbag << 8) | srcslot);
@@ -141,12 +141,12 @@ void WorldSession::HandleSwapItem(WorldPacket & recv_data)
     _player->SwapItem(src, dst);
 }
 
-void WorldSession::HandleAutoEquipItemOpcode(WorldPacket & recv_data)
+void WorldSession::HandleAutoEquipItemOpcode(WorldPacket & recvData)
 {
     //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_AUTOEQUIP_ITEM");
     uint8 srcbag, srcslot;
 
-    recv_data >> srcbag >> srcslot;
+    recvData >> srcbag >> srcslot;
     //sLog->outDebug("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
 
     Item* pSrcItem  = _player->GetItemByPos(srcbag, srcslot);
@@ -235,12 +235,12 @@ void WorldSession::HandleAutoEquipItemOpcode(WorldPacket & recv_data)
     }
 }
 
-void WorldSession::HandleDestroyItemOpcode(WorldPacket & recv_data)
+void WorldSession::HandleDestroyItemOpcode(WorldPacket & recvData)
 {
     //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_DESTROY_ITEM");
     uint8 bag, slot, count, data1, data2, data3;
 
-    recv_data >> bag >> slot >> count >> data1 >> data2 >> data3;
+    recvData >> bag >> slot >> count >> data1 >> data2 >> data3;
     //sLog->outDebug("STORAGE: receive bag = %u, slot = %u, count = %u", bag, slot, count);
 
     uint16 pos = (bag << 8) | slot;
@@ -473,26 +473,26 @@ void WorldSession::HandleReadItem(WorldPacket& recvData)
         _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL);
 }
 
-void WorldSession::HandlePageQuerySkippedOpcode(WorldPacket & recv_data)
+void WorldSession::HandlePageQuerySkippedOpcode(WorldPacket & recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PAGE_TEXT_QUERY");
 
     uint32 itemid;
     uint64 guid;
 
-    recv_data >> itemid >> guid;
+    recvData >> itemid >> guid;
 
     sLog->outDetail("Packet Info: itemid: %u guidlow: %u guidentry: %u guidhigh: %u",
         itemid, GUID_LOPART(guid), GUID_ENPART(guid), GUID_HIPART(guid));
 }
 
-void WorldSession::HandleSellItemOpcode(WorldPacket & recv_data)
+void WorldSession::HandleSellItemOpcode(WorldPacket & recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SELL_ITEM");
     uint64 vendorguid, itemguid;
     uint32 count;
 
-    recv_data >> vendorguid >> itemguid >> count;
+    recvData >> vendorguid >> itemguid >> count;
 
     if (!itemguid)
         return;
@@ -648,14 +648,14 @@ void WorldSession::HandleBuybackItem(WorldPacket& recvData)
         _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, 0, 0);
 }
 
-void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recv_data)
+void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM_IN_SLOT");
     uint64 vendorguid, bagguid;
     uint32 item, slot, count;
     uint8 bagslot;
 
-    recv_data >> vendorguid >> item  >> slot >> bagguid >> bagslot >> count;
+    recvData >> vendorguid >> item  >> slot >> bagguid >> bagslot >> count;
 
     // client expects count starting at 1, and we send vendorslot+1 to client already
     if (slot > 0)
@@ -681,7 +681,7 @@ void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recv_data)
     GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, bag, bagslot);
 }
 
-void WorldSession::HandleBuyItemOpcode(WorldPacket& recv_data)
+void WorldSession::HandleBuyItemOpcode(WorldPacket& recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM");
     uint64 vendorguid, bagGuid;
@@ -689,7 +689,7 @@ void WorldSession::HandleBuyItemOpcode(WorldPacket& recv_data)
     uint8 itemType; // 1 = item, 2 = currency (not implemented)
     uint8 bagSlot;
     
-    recv_data >> vendorguid >> itemType >> item >> slot >> count >> bagGuid >> bagSlot;
+    recvData >> vendorguid >> itemType >> item >> slot >> count >> bagGuid >> bagSlot;
 
     // client expects count starting at 1, and we send vendorslot+1 to client already
     if (slot > 0)
@@ -706,11 +706,11 @@ void WorldSession::HandleBuyItemOpcode(WorldPacket& recv_data)
     GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, bag, bagSlot);
 }
 
-void WorldSession::HandleListInventoryOpcode(WorldPacket & recv_data)
+void WorldSession::HandleListInventoryOpcode(WorldPacket & recvData)
 {
     uint64 guid;
 
-    recv_data >> guid;
+    recvData >> guid;
 
     if (!GetPlayer()->isAlive())
         return;
@@ -843,12 +843,12 @@ void WorldSession::SendListInventory(uint64 vendorGuid)
     SendPacket(&data);
 }
 
-void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket& recv_data)
+void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket& recvData)
 {
     //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_AUTOSTORE_BAG_ITEM");
     uint8 srcbag, srcslot, dstbag;
 
-    recv_data >> srcbag >> srcslot >> dstbag;
+    recvData >> srcbag >> srcslot >> dstbag;
     //sLog->outDebug("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u", srcbag, srcslot, dstbag);
 
     Item* pItem = _player->GetItemByPos(srcbag, srcslot);
@@ -1041,14 +1041,14 @@ void WorldSession::SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid,
     SendPacket(&data);
 }
 
-void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
+void WorldSession::HandleWrapItemOpcode(WorldPacket& recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_WRAP_ITEM");
 
     uint8 gift_bag, gift_slot, item_bag, item_slot;
 
-    recv_data >> gift_bag >> gift_slot;                     // paper
-    recv_data >> item_bag >> item_slot;                     // item
+    recvData >> gift_bag >> gift_slot;                     // paper
+    recvData >> item_bag >> item_slot;                     // item
 
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WRAP: receive gift_bag = %u, gift_slot = %u, item_bag = %u, item_slot = %u", gift_bag, gift_slot, item_bag, item_slot);
 
@@ -1152,19 +1152,19 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
     _player->DestroyItemCount(gift, count, true);
 }
 
-void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
+void WorldSession::HandleSocketOpcode(WorldPacket& recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SOCKET_GEMS");
 
     uint64 item_guid;
     uint64 gem_guids[MAX_GEM_SOCKETS];
 
-    recv_data >> item_guid;
+    recvData >> item_guid;
     if (!item_guid)
         return;
 
     for (int i = 0; i < MAX_GEM_SOCKETS; ++i)
-        recv_data >> gem_guids[i];
+        recvData >> gem_guids[i];
 
     //cheat -> tried to socket same gem multiple times
     if ((gem_guids[0] && (gem_guids[0] == gem_guids[1] || gem_guids[0] == gem_guids[2])) ||
@@ -1216,6 +1216,14 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         // tried to put meta gem in normal socket
         if (itemProto->Socket[i].Color != SOCKET_COLOR_META && GemProps[i]->color == SOCKET_COLOR_META)
             return;
+            
+        // tried to put normal gem in cogwheel socket
+        if (itemProto->Socket[i].Color == SOCKET_COLOR_COGWHEEL && GemProps[i]->color != SOCKET_COLOR_COGWHEEL)
+            return;
+
+        // tried to put cogwheel gem in normal socket
+        if (itemProto->Socket[i].Color != SOCKET_COLOR_COGWHEEL && GemProps[i]->color == SOCKET_COLOR_COGWHEEL)
+            return;
     }
 
     uint32 GemEnchants[MAX_GEM_SOCKETS];
@@ -1346,13 +1354,13 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
     itemTarget->ClearSoulboundTradeable(_player);           // clear tradeable flag
 }
 
-void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data)
+void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CANCEL_TEMP_ENCHANTMENT");
 
     uint32 slot;
 
-    recv_data >> slot;
+    recvData >> slot;
 
     // apply only to equipped item
     if (!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, slot))
@@ -1370,12 +1378,12 @@ void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data)
     item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT);
 }
 
-void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recv_data)
+void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_REFUND_INFO");
 
     uint64 guid;
-    recv_data >> guid;                                      // item guid
+    recvData >> guid;                                      // item guid
 
     Item* item = _player->GetItemByGuid(guid);
     if (!item)
@@ -1387,11 +1395,11 @@ void WorldSession::HandleItemRefundInfoRequest(WorldPacket& recv_data)
     GetPlayer()->SendRefundInfo(item);
 }
 
-void WorldSession::HandleItemRefund(WorldPacket &recv_data)
+void WorldSession::HandleItemRefund(WorldPacket &recvData)
 {
     sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_ITEM_REFUND");
     uint64 guid;
-    recv_data >> guid;                                      // item guid
+    recvData >> guid;                                      // item guid
 
     Item* item = _player->GetItemByGuid(guid);
     if (!item)
@@ -1408,10 +1416,10 @@ void WorldSession::HandleItemRefund(WorldPacket &recv_data)
  *
  * This function is called when player clicks on item which has some flag set
  */
-void WorldSession::HandleItemTextQuery(WorldPacket & recv_data )
+void WorldSession::HandleItemTextQuery(WorldPacket & recvData )
 {
     uint64 itemGuid;
-    recv_data >> itemGuid;
+    recvData >> itemGuid;
 
     sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ITEM_TEXT_QUERY item guid: %u", GUID_LOPART(itemGuid));