From b2ba84fb6ab2b3c9db9238f550283092deb47f5f Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 11 Nov 2017 13:31:24 +1100 Subject: [PATCH] Fix lava offset (oops) --- ClassicalSharp/Blocks/BlockInfo.cs | 5 +++-- src/Client/Block.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ClassicalSharp/Blocks/BlockInfo.cs b/ClassicalSharp/Blocks/BlockInfo.cs index 304efeae3..53028996b 100644 --- a/ClassicalSharp/Blocks/BlockInfo.cs +++ b/ClassicalSharp/Blocks/BlockInfo.cs @@ -69,8 +69,9 @@ namespace ClassicalSharp { public static bool IsLiquid(BlockID block) { byte collide = ExtendedCollide[block]; - return Draw[block] == DrawType.Translucent && - (collide == CollideType.LiquidWater || collide == CollideType.LiquidLava); + return + (collide == CollideType.LiquidWater && Draw[block] == DrawType.Translucent) || + (collide == CollideType.LiquidLava && Draw[block] == DrawType.Transparent); } public static bool[] BlocksLight = new bool[Block.Count]; diff --git a/src/Client/Block.c b/src/Client/Block.c index 0eb2dd14b..098a935b0 100644 --- a/src/Client/Block.c +++ b/src/Client/Block.c @@ -174,8 +174,9 @@ Int32 Block_FindID(STRING_PURE String* name) { bool Block_IsLiquid(BlockID b) { CollideType collide = Block_ExtendedCollide[b]; - return Block_Draw[b] == DrawType_Translucent && - (collide == CollideType_LiquidWater || collide == CollideType_LiquidLava); + return + (collide == CollideType_LiquidWater && Block_Draw[b] == DrawType_Translucent) || + (collide == CollideType_LiquidLava && Block_Draw[b] == DrawType_Transparent); }