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.h | |
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 'source/packets/cPacket_CreateInventoryAction.h')
-rw-r--r-- | source/packets/cPacket_CreateInventoryAction.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/packets/cPacket_CreateInventoryAction.h b/source/packets/cPacket_CreateInventoryAction.h index e4ed2d9f8..02af3a64e 100644 --- a/source/packets/cPacket_CreateInventoryAction.h +++ b/source/packets/cPacket_CreateInventoryAction.h @@ -10,8 +10,8 @@ public: : m_Slot( 0 ) , m_ItemID( 0 ) , m_Quantity( 0 ) - , m_Short( 0 ) - { m_PacketID = E_CREATE_INVENTORY_ACTION; m_Short = 0; m_Quantity = 1; } + , m_Damage( 0 ) + { m_PacketID = E_CREATE_INVENTORY_ACTION; m_Quantity = 1; } cPacket_CreateInventoryAction( const cPacket_CreateInventoryAction & a_Copy ); virtual cPacket* Clone() const { return new cPacket_CreateInventoryAction(*this); } @@ -21,7 +21,7 @@ public: short m_Slot; // 0 = hold 1-4 = armor short m_ItemID; short m_Quantity; - short m_Short; + short m_Damage; - static const unsigned int c_Size = 1 + 4 + 2 + 2 + 2; + static const unsigned int c_Size = 1 + 2 + 2 + 2 + 2; }; |