summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-03-16 14:01:22 +0100
committermadmaxoft <github@xoft.cz>2014-03-16 21:38:57 +0100
commitb9fce71bf68768ee86ce128f353fea5533f50732 (patch)
treece0d3f88151971baa3adb5433aa15e072a5d02e3 /src/Blocks
parentFixed InfoReg.lua's handling of multi-level commands. (diff)
downloadcuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar
cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.gz
cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.bz2
cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.lz
cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.xz
cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.tar.zst
cuberite-b9fce71bf68768ee86ce128f353fea5533f50732.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockLeaves.h3
-rw-r--r--src/Blocks/BlockMushroom.h1
-rw-r--r--src/Blocks/BlockVine.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h
index 7b8f0b378..954b993d6 100644
--- a/src/Blocks/BlockLeaves.h
+++ b/src/Blocks/BlockLeaves.h
@@ -16,6 +16,7 @@
{ \
case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, (BLOCKTYPE)(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_LOG: return true; \
+ case E_BLOCK_NEW_LOG: return true; \
}
bool HasNearLog(cBlockArea &a_Area, int a_BlockX, int a_BlockY, int a_BlockZ);
@@ -86,7 +87,7 @@ public:
return;
}
- if ((Meta & 0x8) != 0)
+ if ((Meta & 0x8) == 0)
{
// These leaves have been checked for decay lately and nothing around them changed
return;
diff --git a/src/Blocks/BlockMushroom.h b/src/Blocks/BlockMushroom.h
index 623cfda64..c30c1a401 100644
--- a/src/Blocks/BlockMushroom.h
+++ b/src/Blocks/BlockMushroom.h
@@ -39,6 +39,7 @@ public:
case E_BLOCK_CACTUS:
case E_BLOCK_ICE:
case E_BLOCK_LEAVES:
+ case E_BLOCK_NEW_LEAVES:
case E_BLOCK_AIR:
{
return false;
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h
index 708583e70..8041d9359 100644
--- a/src/Blocks/BlockVine.h
+++ b/src/Blocks/BlockVine.h
@@ -73,7 +73,7 @@ public:
/// Returns true if the specified block type is good for vines to attach to
static bool IsBlockAttachable(BLOCKTYPE a_BlockType)
{
- return (a_BlockType == E_BLOCK_LEAVES) || cBlockInfo::IsSolid(a_BlockType);
+ return (a_BlockType == E_BLOCK_LEAVES) || (a_BlockType == E_BLOCK_NEW_LEAVES) || cBlockInfo::IsSolid(a_BlockType);
}