diff options
| author | tonibm19 <tonibm19@gmail.com> | 2013-12-24 18:07:33 +0100 |
|---|---|---|
| committer | tonibm19 <tonibm19@gmail.com> | 2013-12-24 18:07:33 +0100 |
| commit | c06388aa4ab7d5f41922f669b1960762188545b6 (patch) | |
| tree | d443e2e017bd01a8269a09725582ee3e25579084 /src/Blocks | |
| parent | Using parenthesis (diff) | |
| download | cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.tar cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.tar.gz cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.tar.bz2 cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.tar.lz cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.tar.xz cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.tar.zst cuberite-c06388aa4ab7d5f41922f669b1960762188545b6.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockPumpkin.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Blocks/BlockPumpkin.h b/src/Blocks/BlockPumpkin.h index 79b3f3a54..78a38fd02 100644 --- a/src/Blocks/BlockPumpkin.h +++ b/src/Blocks/BlockPumpkin.h @@ -16,12 +16,14 @@ public: virtual void OnPlacedByPlayer(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override { - if (a_BlockY > 1) + if (a_BlockY > 1) // Make sure server won't check for inexistent blocks (below y=0) { + int BlockY1 = a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ); + int BlockY2 = a_World->GetBlock(a_BlockX, a_BlockY - 2, a_BlockZ);// We don't need to check this blocks more than 1 time if ( - a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) == E_BLOCK_SNOW_BLOCK && - a_World->GetBlock(a_BlockX, a_BlockY - 2, a_BlockZ) == E_BLOCK_SNOW_BLOCK + (BlockY1 == E_BLOCK_SNOW_BLOCK) && + (BlockY2 == E_BLOCK_SNOW_BLOCK) ) { a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0); @@ -31,10 +33,10 @@ public: } if ( - (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) == E_BLOCK_IRON_BLOCK) && + (BlockY1 == E_BLOCK_IRON_BLOCK) && (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ + 1) == E_BLOCK_IRON_BLOCK) && (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ - 1) == E_BLOCK_IRON_BLOCK) && - (a_World->GetBlock(a_BlockX, a_BlockY - 2, a_BlockZ) == E_BLOCK_IRON_BLOCK) + (BlockY2 == E_BLOCK_IRON_BLOCK) ) { a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0); |