diff options
| author | Mattes D <github@xoft.cz> | 2014-02-20 22:14:16 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-02-20 22:14:16 +0100 |
| commit | 6c9779630e1c1101198f2e5c2d885c3bdf5163cc (patch) | |
| tree | 34d86fc72a8dcc1531d17cdf7970920e3cbbf199 /src/Blocks | |
| parent | Merge pull request #702 from TheJumper/master (diff) | |
| parent | Bad UTF-8 o.O (diff) | |
| download | cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.tar cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.tar.gz cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.tar.bz2 cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.tar.lz cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.tar.xz cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.tar.zst cuberite-6c9779630e1c1101198f2e5c2d885c3bdf5163cc.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockCauldron.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h index 09d5c3cbb..2e1032d2b 100644 --- a/src/Blocks/BlockCauldron.h +++ b/src/Blocks/BlockCauldron.h @@ -21,24 +21,30 @@ public: a_Pickups.push_back(cItem(E_ITEM_CAULDRON, 1, 0)); } - void OnUse(cChunkInterface * a_ChunkInterface, cWorldInterface * a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) + virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override { - char Meta = a_ChunkInterface->GetBlockMeta( a_BlockX, a_BlockY, a_BlockZ ); - switch( a_Player->GetEquippedItem().m_ItemType ) + char Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); + switch (a_Player->GetEquippedItem().m_ItemType) { case E_ITEM_WATER_BUCKET: { - a_ChunkInterface->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, 3 ); - a_Player->GetInventory().RemoveOneEquippedItem(); - cItem NewItem(E_ITEM_BUCKET, 1); - a_Player->GetInventory().AddItem(NewItem); + if (Meta < 3) + { + a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, 3); + if (!a_Player->IsGameModeCreative()) + { + a_Player->GetInventory().RemoveOneEquippedItem(); + cItem NewItem(E_ITEM_BUCKET, 1); + a_Player->GetInventory().AddItem(NewItem); + } + } break; } case E_ITEM_GLASS_BOTTLE: { - if( Meta > 0 ) + if (Meta > 0) { - a_ChunkInterface->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, --Meta); + a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, --Meta); a_Player->GetInventory().RemoveOneEquippedItem(); cItem NewItem(E_ITEM_POTIONS, 1, 0); a_Player->GetInventory().AddItem(NewItem); |