diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-12-14 13:14:48 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-12-14 13:14:48 +0100 |
| commit | bed456033f9856ad110368a4eb9c8317c4378acb (patch) | |
| tree | 0a25c42398a9ee675956933289aacc7779029584 | |
| parent | Fixes (diff) | |
| download | cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.tar cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.tar.gz cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.tar.bz2 cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.tar.lz cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.tar.xz cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.tar.zst cuberite-bed456033f9856ad110368a4eb9c8317c4378acb.zip | |
| -rw-r--r-- | src/Blocks/BlockCocoaPod.h | 4 | ||||
| -rw-r--r-- | src/World.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockCocoaPod.h b/src/Blocks/BlockCocoaPod.h index cfd3b4479..1b659d48f 100644 --- a/src/Blocks/BlockCocoaPod.h +++ b/src/Blocks/BlockCocoaPod.h @@ -38,7 +38,7 @@ public: { NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ); NIBBLETYPE TypeMeta = Meta & 0x03; - int GrowState = (Meta & 0x0f) >> 2; + int GrowState = Meta >> 2; if (GrowState < 2) { @@ -51,7 +51,7 @@ public: virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - int GrowState = (a_BlockMeta & 0x0f) >> 2; + int GrowState = a_BlockMeta >> 2; a_Pickups.Add(E_ITEM_DYE, ((GrowState >= 2) ? 3 : 1), E_META_DYE_BROWN); } diff --git a/src/World.cpp b/src/World.cpp index fc4a1fdfd..d3bde3559 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -1524,7 +1524,7 @@ bool cWorld::GrowRipePlant(int a_BlockX, int a_BlockY, int a_BlockZ, bool a_IsBy case E_BLOCK_COCOA_POD: { NIBBLETYPE TypeMeta = BlockMeta & 0x03; - int GrowState = (BlockMeta & 0x0f) >> 2; + int GrowState = BlockMeta >> 2; if (GrowState < 2) { |