0f3b030a1d
Update FML: bd2123c bd2123c Clean up some patch fuzz c2a603c Update joined.exc file from latest conf db12af4 Update to 1.4.3
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
--- ../src_base/common/net/minecraft/src/BlockChest.java
|
|
+++ ../src_work/common/net/minecraft/src/BlockChest.java
|
|
@@ -4,6 +4,7 @@
|
|
import cpw.mods.fml.common.asm.SideOnly;
|
|
import java.util.Iterator;
|
|
import java.util.Random;
|
|
+import static net.minecraftforge.common.ForgeDirection.*;
|
|
|
|
public class BlockChest extends BlockContainer
|
|
{
|
|
@@ -411,7 +412,7 @@
|
|
{
|
|
return true;
|
|
}
|
|
- else if (par1World.isBlockNormalCube(par2, par3 + 1, par4))
|
|
+ else if (par1World.isBlockSolidOnSide(par2, par3 + 1, par4, DOWN))
|
|
{
|
|
return true;
|
|
}
|
|
@@ -419,19 +420,19 @@
|
|
{
|
|
return true;
|
|
}
|
|
- else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && (par1World.isBlockNormalCube(par2 - 1, par3 + 1, par4) || isOcelotBlockingChest(par1World, par2 - 1, par3, par4)))
|
|
- {
|
|
- return true;
|
|
- }
|
|
- else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && (par1World.isBlockNormalCube(par2 + 1, par3 + 1, par4) || isOcelotBlockingChest(par1World, par2 + 1, par3, par4)))
|
|
- {
|
|
- return true;
|
|
- }
|
|
- else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && (par1World.isBlockNormalCube(par2, par3 + 1, par4 - 1) || isOcelotBlockingChest(par1World, par2, par3, par4 - 1)))
|
|
- {
|
|
- return true;
|
|
- }
|
|
- else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && (par1World.isBlockNormalCube(par2, par3 + 1, par4 + 1) || isOcelotBlockingChest(par1World, par2, par3, par4 + 1)))
|
|
+ else if (par1World.getBlockId(par2 - 1, par3, par4) == this.blockID && (par1World.isBlockSolidOnSide(par2 - 1, par3 + 1, par4, DOWN) || isOcelotBlockingChest(par1World, par2 - 1, par3, par4)))
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+ else if (par1World.getBlockId(par2 + 1, par3, par4) == this.blockID && (par1World.isBlockSolidOnSide(par2 + 1, par3 + 1, par4, DOWN) || isOcelotBlockingChest(par1World, par2 + 1, par3, par4)))
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+ else if (par1World.getBlockId(par2, par3, par4 - 1) == this.blockID && (par1World.isBlockSolidOnSide(par2, par3 + 1, par4 - 1, DOWN) || isOcelotBlockingChest(par1World, par2, par3, par4 - 1)))
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+ else if (par1World.getBlockId(par2, par3, par4 + 1) == this.blockID && (par1World.isBlockSolidOnSide(par2, par3 + 1, par4 + 1, DOWN) || isOcelotBlockingChest(par1World, par2, par3, par4 + 1)))
|
|
{
|
|
return true;
|
|
}
|