diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index a796278a7..d708db025 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -80,7 +80,7 @@ { ItemStack var8 = this.createStackedBlock(par6); -@@ -1099,6 +1099,362 @@ +@@ -1099,6 +1099,376 @@ */ public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {} @@ -141,6 +141,20 @@ + */ + public boolean isBlockSolidOnSide(World world, int x, int y, int z, int side) + { ++ int meta = world.getBlockMetadata(x, y, z); ++ if (this instanceof BlockStep) ++ { ++ return (((meta & 8) == 8 && (side == 1)) || isOpaqueCube()); ++ } ++ else if (this instanceof BlockFarmland) ++ { ++ return (side != 1 && side != 0); ++ } ++ else if (this instanceof BlockStairs) ++ { ++ boolean flipped = ((meta & 4) != 0); ++ return ((meta & 3) + side == 5) || (side == 1 && flipped); ++ } + return isBlockNormalCube(world, x, y, z); + } + diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 84394a1d4..70e23e9f8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -68,7 +68,7 @@ { ItemStack var8 = this.createStackedBlock(par6); -@@ -1010,6 +1012,362 @@ +@@ -1010,6 +1012,376 @@ */ public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {} @@ -129,6 +129,20 @@ + */ + public boolean isBlockSolidOnSide(World world, int x, int y, int z, int side) + { ++ int meta = world.getBlockMetadata(x, y, z); ++ if (this instanceof BlockStep) ++ { ++ return (((meta & 8) == 8 && (side == 1)) || isOpaqueCube()); ++ } ++ else if (this instanceof BlockFarmland) ++ { ++ return (side != 1 && side != 0); ++ } ++ else if (this instanceof BlockStairs) ++ { ++ boolean flipped = ((meta & 4) != 0); ++ return ((meta & 3) + side == 5) || (side == 1 && flipped); ++ } + return isBlockNormalCube(world, x, y, z); + } +