From 437d83e9b35c02b2c3c96f49a808571a45375998 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 5 Sep 2012 22:06:32 -0700 Subject: [PATCH] Fix placing torches and the like on inverted woden slabs. --- patches/common/net/minecraft/src/Block.java.patch | 2 +- patches/minecraft/net/minecraft/src/RenderBlocks.java.patch | 2 +- patches/minecraft/net/minecraft/src/RenderItem.java.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/common/net/minecraft/src/Block.java.patch b/patches/common/net/minecraft/src/Block.java.patch index 401b0fccb5..277ecf9b50 100644 --- a/patches/common/net/minecraft/src/Block.java.patch +++ b/patches/common/net/minecraft/src/Block.java.patch @@ -167,7 +167,7 @@ + public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) + { + int meta = world.getBlockMetadata(x, y, z); -+ if (this instanceof BlockStep) ++ if (this instanceof BlockHalfSlab) + { + return (((meta & 8) == 8 && (side == UP)) || isOpaqueCube()); + } diff --git a/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index 3773cdce3d..9bf4ee421c 100644 --- a/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -22,8 +22,8 @@ float var10 = 1.0F; float var11 = 0.8F; @@ -1959,7 +1960,7 @@ - double var28; double var30; + double var32; - if (!this.blockAccess.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && !Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 - 1, par4)) + if (!this.blockAccess.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && !Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 - 1, par4, UP)) diff --git a/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/patches/minecraft/net/minecraft/src/RenderItem.java.patch index 27bd0ac9e6..160d273d3a 100644 --- a/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -76,8 +76,8 @@ if (this.field_77024_a) { @@ -192,9 +191,9 @@ - float var11; float var12; + float var16; - if (par3 < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[par3].getRenderType())) - {