From a50f2a094d7e89d43d5f56b49a214a4e82b9cbbf Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 24 Feb 2012 20:28:59 -0800 Subject: [PATCH] Fixed up Shearable blocks to play nicer with sub-classes. --- .../patches/minecraft/net/minecraft/src/BlockLeaves.java.patch | 2 +- .../minecraft/net/minecraft/src/BlockTallGrass.java.patch | 2 +- forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch | 2 +- .../minecraft_server/net/minecraft/src/BlockLeaves.java.patch | 2 +- .../net/minecraft/src/BlockTallGrass.java.patch | 2 +- .../minecraft_server/net/minecraft/src/BlockVine.java.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch index c74d5825d5..b5caae4672 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLeaves.java.patch @@ -45,7 +45,7 @@ + public ArrayList onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) + { + ArrayList ret = new ArrayList(); -+ ret.add(new ItemStack(Block.leaves.blockID, 1, world.getBlockMetadata(X, Y, Z) & 3)); ++ ret.add(new ItemStack(this, 1, world.getBlockMetadata(X, Y, Z) & 3)); + return ret; + } } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index 9697550794..92e097dad1 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -75,7 +75,7 @@ + public ArrayList onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) + { + ArrayList ret = new ArrayList(); -+ ret.add(new ItemStack(Block.tallGrass, 1, world.getBlockMetadata(X, Y, Z))); ++ ret.add(new ItemStack(this, 1, world.getBlockMetadata(X, Y, Z))); + return ret; } } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch index 4994bdaf4d..a54d39a988 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch @@ -39,7 +39,7 @@ + public ArrayList onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) + { + ArrayList ret = new ArrayList(); -+ ret.add(new ItemStack(Block.vine, 1, 0)); ++ ret.add(new ItemStack(this, 1, 0)); + return ret; } } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch index 55af10dd71..2dc72129dd 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLeaves.java.patch @@ -45,7 +45,7 @@ + public ArrayList onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) + { + ArrayList ret = new ArrayList(); -+ ret.add(new ItemStack(Block.leaves.blockID, 1, world.getBlockMetadata(X, Y, Z) & 3)); ++ ret.add(new ItemStack(this, 1, world.getBlockMetadata(X, Y, Z) & 3)); + return ret; + } } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index e316e94b85..8a03b9b88f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -71,7 +71,7 @@ + public ArrayList onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) + { + ArrayList ret = new ArrayList(); -+ ret.add(new ItemStack(Block.tallGrass, 1, world.getBlockMetadata(X, Y, Z))); ++ ret.add(new ItemStack(this, 1, world.getBlockMetadata(X, Y, Z))); + return ret; } } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch index 9b1637bdb4..c836de614e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch @@ -39,7 +39,7 @@ + public ArrayList onSheared(ItemStack item, World world, int X, int Y, int Z, int fortune) + { + ArrayList ret = new ArrayList(); -+ ret.add(new ItemStack(Block.vine, 1, 0)); ++ ret.add(new ItemStack(this, 1, 0)); + return ret; } }