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_InventorySlot.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'source/packets/cPacket_InventorySlot.cpp') diff --git a/source/packets/cPacket_InventorySlot.cpp b/source/packets/cPacket_InventorySlot.cpp index 13b41b7b1..3c3a40210 100644 --- a/source/packets/cPacket_InventorySlot.cpp +++ b/source/packets/cPacket_InventorySlot.cpp @@ -1,21 +1,25 @@ #include "cPacket_InventorySlot.h" +#include "cPacket_WholeInventory.h" +#include "cPacket_ItemData.h" bool cPacket_InventorySlot::Send(cSocket & a_Socket) { unsigned int TotalSize = c_Size; - if( m_ItemID > -1 ) TotalSize += 1 + 2; + + cPacket_ItemData Item; + + TotalSize += Item.GetSize(m_ItemID); + char* Message = new char[TotalSize]; unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); + AppendByte ( (char)m_PacketID, Message, i ); AppendByte ( m_WindowID, Message, i ); AppendShort ( m_SlotNum, Message, i ); - AppendShort ( m_ItemID, Message, i ); - if( m_ItemID > -1 ) - { - AppendByte ( m_ItemCount, Message, i ); - AppendShort ( m_ItemUses, Message, i ); - } + + + Item.AppendItem(Message, i, m_ItemID, m_ItemCount, m_ItemUses); + bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); delete [] Message; -- cgit v1.2.3