diff options
author | admin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-10-26 22:52:19 +0200 |
---|---|---|
committer | admin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-10-26 22:52:19 +0200 |
commit | 88270be66928f3b73b73fc1f3b26a74358089223 (patch) | |
tree | 736a03b5343df0693638f59b39a9f3599d7d9057 /source/packets/cPacket_CreateInventoryAction.cpp | |
parent | Moved GAMEMODE declaration to a single place... cPacket.h. Player can't take damage any more but can still sometimes die on spawn. Not sure why. Falling through the void does not kill you yet. (diff) | |
download | cuberite-88270be66928f3b73b73fc1f3b26a74358089223.tar cuberite-88270be66928f3b73b73fc1f3b26a74358089223.tar.gz cuberite-88270be66928f3b73b73fc1f3b26a74358089223.tar.bz2 cuberite-88270be66928f3b73b73fc1f3b26a74358089223.tar.lz cuberite-88270be66928f3b73b73fc1f3b26a74358089223.tar.xz cuberite-88270be66928f3b73b73fc1f3b26a74358089223.tar.zst cuberite-88270be66928f3b73b73fc1f3b26a74358089223.zip |
Diffstat (limited to '')
-rw-r--r-- | source/packets/cPacket_CreateInventoryAction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/packets/cPacket_CreateInventoryAction.cpp b/source/packets/cPacket_CreateInventoryAction.cpp index 19996769f..40aad22e8 100644 --- a/source/packets/cPacket_CreateInventoryAction.cpp +++ b/source/packets/cPacket_CreateInventoryAction.cpp @@ -6,7 +6,7 @@ cPacket_CreateInventoryAction::cPacket_CreateInventoryAction( const cPacket_Crea m_Slot = a_Copy.m_Slot; m_ItemID = a_Copy.m_ItemID; m_Quantity = 0; - m_Short = 0; + m_Damage = 0; } bool cPacket_CreateInventoryAction::Parse(cSocket & a_Socket) @@ -15,7 +15,7 @@ bool cPacket_CreateInventoryAction::Parse(cSocket & a_Socket) if( !ReadShort ( m_Slot ) ) return false; if( !ReadShort ( m_ItemID ) ) return false; if( !ReadShort ( m_Quantity ) ) return false; - if( !ReadShort ( m_Short ) ) return false; + if( !ReadShort ( m_Damage ) ) return false; return true; } @@ -34,7 +34,7 @@ bool cPacket_CreateInventoryAction::Send(cSocket & a_Socket) AppendShort ( m_Slot, Message, i ); AppendShort ( m_ItemID, Message, i ); AppendShort ( m_Quantity, Message, i ); - AppendShort ( m_Short, Message, i ); + AppendShort ( m_Damage, Message, i ); bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); delete [] Message; |