flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

"& 0x0f" isn't needed

Browse Source
This commit is contained in:
Howaner 2014-12-14 13:14:48 +01:00
parent 2a8c234f46
commit bed456033f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Blocks/BlockCocoaPod.h
View File

@ -38,7 +38,7 @@ public:
{ {
NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ); NIBBLETYPE Meta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);
NIBBLETYPE TypeMeta = Meta & 0x03; NIBBLETYPE TypeMeta = Meta & 0x03;
int GrowState = (Meta & 0x0f) >> 2; int GrowState = Meta >> 2;
if (GrowState < 2) if (GrowState < 2)
{ {
@ -51,7 +51,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override 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); a_Pickups.Add(E_ITEM_DYE, ((GrowState >= 2) ? 3 : 1), E_META_DYE_BROWN);
} }

2
src/World.cpp
View File

@ -1524,7 +1524,7 @@ bool cWorld::GrowRipePlant(int a_BlockX, int a_BlockY, int a_BlockZ, bool a_IsBy
case E_BLOCK_COCOA_POD: case E_BLOCK_COCOA_POD:
{ {
NIBBLETYPE TypeMeta = BlockMeta & 0x03; NIBBLETYPE TypeMeta = BlockMeta & 0x03;
int GrowState = (BlockMeta & 0x0f) >> 2; int GrowState = BlockMeta >> 2;
if (GrowState < 2) if (GrowState < 2)
{ {