ZS: Fix snow counting as pillaring and triggering noclip

This commit is contained in:
UnknownShadow200 2016-10-04 22:42:44 +11:00
parent 1d04102821
commit 6d755205c0
2 changed files with 3 additions and 4 deletions

View File

@ -23,7 +23,8 @@ namespace MCGalaxy
public sealed partial class Block public sealed partial class Block
{ {
public static bool Walkthrough(byte block) { public static bool Walkthrough(byte block) {
return block == air || block == shrub || block == fire || block == rope return block == air || block == shrub || block == Block.snow
|| block == fire || block == rope
|| (block >= water && block <= lavastill) || (block >= water && block <= lavastill)
|| (block >= yellowflower && block <= redmushroom); || (block >= yellowflower && block <= redmushroom);
} }

View File

@ -41,9 +41,7 @@ namespace MCGalaxy.Games.ZS {
} }
static bool NotPillaring(byte b, byte old) { static bool NotPillaring(byte b, byte old) {
if (b == Block.shrub || b == Block.fire || b == Block.rope) return true; if (Block.Walkthrough(b)) return true;
if (b >= Block.yellowflower && b <= Block.redmushroom) return true;
old = Block.Convert(old); old = Block.Convert(old);
return old >= Block.water && old <= Block.lavastill; return old >= Block.water && old <= Block.lavastill;
} }