From 9efdca3aab9a8c36e87469299115bfc2df26244c Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 26 Jun 2012 12:10:42 -0700 Subject: [PATCH] Fixed isBlockReplaceable and placing ItemBlocks' --- .../minecraft/net/minecraft/src/ItemBlock.java.patch | 12 ++++++++++++ .../net/minecraft/src/ItemBlock.java.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch create mode 100644 forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch new file mode 100644 index 000000000..ebb6e48cf --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch @@ -0,0 +1,12 @@ +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +@@ -32,7 +32,8 @@ + { + par7 = 1; + } +- else if (var8 != Block.vine.blockID && var8 != Block.tallGrass.blockID && var8 != Block.deadBush.blockID) ++ else if (var8 != Block.vine.blockID && var8 != Block.tallGrass.blockID && var8 != Block.deadBush.blockID ++ && (Block.blocksList[var8] != null && !Block.blocksList[var8].isBlockReplaceable(par3World, par4, par5, par6))) + { + if (par7 == 0) + { diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch new file mode 100644 index 000000000..0f89de5a6 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch @@ -0,0 +1,12 @@ +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +@@ -32,7 +32,8 @@ + { + par7 = 1; + } +- else if (var8 != Block.vine.blockID && var8 != Block.tallGrass.blockID && var8 != Block.deadBush.blockID) ++ else if (var8 != Block.vine.blockID && var8 != Block.tallGrass.blockID && var8 != Block.deadBush.blockID ++ && (Block.blocksList[var8] != null && !Block.blocksList[var8].isBlockReplaceable(par3World, par4, par5, par6))) + { + if (par7 == 0) + {