diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-18 21:41:29 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-18 21:41:29 +0200 |
| commit | c68aa68c699a618d0172bceacf553ab96fc32cdd (patch) | |
| tree | a2eb1d2e76ea183f2c0aee66accd98beeba48e0d /source/Items/ItemSlab.h | |
| parent | Fixed item damage value not being read from the 1.3.2 protocol (wtf, why was it disabled?) (diff) | |
| download | cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.gz cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.bz2 cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.lz cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.xz cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.tar.zst cuberite-c68aa68c699a618d0172bceacf553ab96fc32cdd.zip | |
Diffstat (limited to 'source/Items/ItemSlab.h')
| -rw-r--r-- | source/Items/ItemSlab.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/Items/ItemSlab.h b/source/Items/ItemSlab.h index 0bab038a2..36779138b 100644 --- a/source/Items/ItemSlab.h +++ b/source/Items/ItemSlab.h @@ -11,28 +11,28 @@ class cItemSlabHandler : public cItemHandler
{
public:
- cItemSlabHandler(int a_ItemID)
- : cItemHandler(a_ItemID)
+ cItemSlabHandler(int a_ItemType)
+ : cItemHandler(a_ItemType)
{
}
- virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, cItem * a_Item, int a_X, int a_Y, int a_Z, char a_Dir) override
+ virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, cItem * a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
{
BLOCKTYPE Block;
NIBBLETYPE Meta;
- a_World->GetBlockTypeMeta(a_X, a_Y, a_Z, Block, Meta);
+ a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, Meta);
if (
- (a_Dir == 0 || a_Dir == 1) // Only when clicking on top or on bottom of the block
- && (Block == E_BLOCK_WOODEN_SLAB || Block == E_BLOCK_STONE_SLAB) // It is a slab
- && (Block == a_Item->m_ItemID) // Same slab
+ ((a_Dir == 0) || (a_Dir == 1)) // Only when clicking on top or on bottom of the block
+ && ((Block == E_BLOCK_WOODEN_SLAB) || (Block == E_BLOCK_STONE_SLAB)) // It is a slab
+ && (Block == a_Item->m_ItemType) // Same slab
&& ((Meta & 0x7) == (a_Item->m_ItemHealth & 0x7))) // Same Texture
{
- cItem Item(a_Item->m_ItemID, 1);
+ cItem Item(a_Item->m_ItemType, 1);
if (a_Player->GetInventory().RemoveItem(Item))
{
- a_World->SetBlock(a_X, a_Y, a_Z, Block - 1, Meta); //Block - 1 simple hack to save one if statement
+ a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement
return true;
}
}
|