From 00da9006b7765808beaa3159243ca22b2645f0ef Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Wed, 27 Dec 2017 19:47:28 +0100 Subject: Lilypads can be on top of (frosted) ice (#4122) Fixes #4117 --- src/Blocks/BlockLilypad.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h index 398d2b64b..9c4edaecc 100644 --- a/src/Blocks/BlockLilypad.h +++ b/src/Blocks/BlockLilypad.h @@ -35,8 +35,8 @@ public: NIBBLETYPE UnderMeta; a_Chunk.GetBlockTypeMeta(a_RelX, a_RelY - 1, a_RelZ, UnderType, UnderMeta); return ( - ((UnderType == E_BLOCK_STATIONARY_WATER) || (UnderType == E_BLOCK_WATER)) && // Water is below... - (UnderMeta == 0) // ... and it's a source + (((UnderType == E_BLOCK_STATIONARY_WATER) || (UnderType == E_BLOCK_WATER)) && (UnderMeta == 0)) || // A water source is below + (UnderType == E_BLOCK_ICE) || (UnderType == E_BLOCK_FROSTED_ICE) // Or (frosted) ice ); } }; -- cgit v1.2.3