summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-02-20 17:45:18 +0100
committerHowaner <franzi.moos@googlemail.com>2014-02-20 17:45:18 +0100
commit01c01bac37a56bf0d6301eee91483250bf76391d (patch)
tree934b47a7759ca3557642cdc9d8fb0eaf7a5cb966 /src
parentMerge pull request #700 from Howaner/GlobalFixes (diff)
downloadcuberite-01c01bac37a56bf0d6301eee91483250bf76391d.tar
cuberite-01c01bac37a56bf0d6301eee91483250bf76391d.tar.gz
cuberite-01c01bac37a56bf0d6301eee91483250bf76391d.tar.bz2
cuberite-01c01bac37a56bf0d6301eee91483250bf76391d.tar.lz
cuberite-01c01bac37a56bf0d6301eee91483250bf76391d.tar.xz
cuberite-01c01bac37a56bf0d6301eee91483250bf76391d.tar.zst
cuberite-01c01bac37a56bf0d6301eee91483250bf76391d.zip
Diffstat (limited to 'src')
-rw-r--r--src/Blocks/BlockCauldron.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h
index 09d5c3cbb..3e8abf4c9 100644
--- a/src/Blocks/BlockCauldron.h
+++ b/src/Blocks/BlockCauldron.h
@@ -28,15 +28,18 @@ public:
{
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 );
+ 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_Player->GetInventory().RemoveOneEquippedItem();