From 02f05f749645d3ef211676e6745d3feda2cd0513 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Wed, 21 Dec 2011 20:42:34 +0000 Subject: =?UTF-8?q?-=20Crafting=20fixed=20in=201.0.0=20-=20Server=20compat?= =?UTF-8?q?ible=20with=20the=20weapons=20and=20equip=20again.=20(Some=20Pa?= =?UTF-8?q?ckets=20were=20incompatible)=20-=20fixed=20bucket=20bugs=20(not?= =?UTF-8?q?=20all)=20-=20Fixed=20clients=20getting=20crashed=20by=20wrong?= =?UTF-8?q?=20Pickups=20-=20fixed=20nearly=20all=20mob=20drops.=20(Check?= =?UTF-8?q?=20wheather=20they=20are=20burning=20is=20missing=20Big=20Grin)?= =?UTF-8?q?=20-=20maybe=20some=20other=20things=20I=20can=C2=B4t=20recall?= =?UTF-8?q?=20atm=20Big=20Grin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://mc-server.googlecode.com/svn/trunk@94 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_WindowClick.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'source/packets/cPacket_WindowClick.cpp') diff --git a/source/packets/cPacket_WindowClick.cpp b/source/packets/cPacket_WindowClick.cpp index 6b295b4d5..a84fbd34a 100644 --- a/source/packets/cPacket_WindowClick.cpp +++ b/source/packets/cPacket_WindowClick.cpp @@ -1,5 +1,6 @@ #include "cPacket_WindowClick.h" - +#include "cPacket_WholeInventory.h" +#include "cPacket_ItemData.h" bool cPacket_WindowClick::Parse(cSocket & a_Socket) { @@ -17,20 +18,15 @@ bool cPacket_WindowClick::Parse(cSocket & a_Socket) // LOG("Right/Le: %i", m_RightMouse ); // LOG("NumClick: %i", m_NumClicks ); - if( !ReadShort(m_ItemID) ) return false; -// LOG("ItemID: %i", m_ItemID ); - if( m_ItemID > -1 ) - { - if( !ReadByte(m_ItemCount) ) return false; - if( !ReadShort(m_ItemUses) ) return false; -// LOG("Count : %i", m_ItemCount ); -// LOG("Uses : %i", m_ItemUses ); - } - else - { - m_ItemCount = 0; - m_ItemUses = 0; - } + cPacket_ItemData Item; + + Item.Parse(m_Socket); + + m_ItemID = Item.m_ItemID; + m_ItemCount = Item.m_ItemCount; + m_ItemUses = Item.m_ItemUses; + + m_EnchantNums = Item.m_EnchantNums; return true; } \ No newline at end of file -- cgit v1.2.3