From e511ba7db8d31821ba9af5ec7cceab00d9924ba6 Mon Sep 17 00:00:00 2001 From: Space Toad Date: Sat, 10 Dec 2011 11:05:49 +0000 Subject: [PATCH] further backward compatibility fixes --- .../minecraft/net/minecraft/src/Block.java.patch | 13 ++++++++++--- .../net/minecraft/src/Block.java.patch | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/patches/minecraft/net/minecraft/src/Block.java.patch b/patches/minecraft/net/minecraft/src/Block.java.patch index 25ca61edd1..4ee7aefd55 100644 --- a/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/patches/minecraft/net/minecraft/src/Block.java.patch @@ -25,7 +25,7 @@ } public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) -@@ -438,25 +441,49 @@ +@@ -438,25 +441,56 @@ { return 1; } @@ -84,10 +84,17 @@ + } + } + return tr; ++ } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ return getBlockDropped (world, i, j, k, md); } public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) -@@ -470,18 +497,13 @@ +@@ -470,18 +504,13 @@ { return; } @@ -109,7 +116,7 @@ } } -@@ -805,6 +827,107 @@ +@@ -805,6 +834,107 @@ return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F; } diff --git a/patches/minecraft_server/net/minecraft/src/Block.java.patch b/patches/minecraft_server/net/minecraft/src/Block.java.patch index deede8e4fe..b4d38e4ed9 100644 --- a/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Random; -@@ -384,26 +385,50 @@ +@@ -384,26 +385,57 @@ return 1; } @@ -68,11 +68,18 @@ + } + return tr; + } ++ ++ /* FORGE: This function returns the complete list of drops for a block. ++ */ ++ public ArrayList getBlockDropped(World world, ++ int i, int j, int k, int md) { ++ return getBlockDropped (world, i, j, k, md); ++ } + public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1) { dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1); -@@ -415,18 +440,14 @@ +@@ -415,18 +447,14 @@ { return; } @@ -94,7 +101,7 @@ } } -@@ -725,6 +746,99 @@ +@@ -725,6 +753,99 @@ return blockMaterial.getMaterialMobility(); }