From a0891d74a01ec80060870c22575c023073304d2b Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 17 Apr 2013 19:08:50 -0700 Subject: [PATCH] Fix return value of EnchantPower hook, closes #518 --- common/net/minecraftforge/common/ForgeHooks.java | 2 +- patches/minecraft/net/minecraft/block/Block.java.patch | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/common/net/minecraftforge/common/ForgeHooks.java index ee2e00bd71..fa1883fea6 100644 --- a/common/net/minecraftforge/common/ForgeHooks.java +++ b/common/net/minecraftforge/common/ForgeHooks.java @@ -379,6 +379,6 @@ public class ForgeHooks } Block block = Block.blocksList[world.getBlockId(x, y, z)]; - return (block == null ? 0 : block.getEnchantPower(world, x, y, z)); + return (block == null ? 0 : block.getEnchantPowerBonus(world, x, y, z)); } } diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 241ab095b7..c040c5f6cd 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -155,7 +155,7 @@ } /** -@@ -1439,4 +1459,911 @@ +@@ -1439,4 +1459,917 @@ canBlockGrass[0] = true; StatList.initBreakableStats(); } @@ -1062,6 +1062,12 @@ + * @param z Z position + * @return The amount of enchanting power this block produces. + */ ++ public float getEnchantPowerBonus(World world, int x, int y, int z) ++ { ++ return getEnchantPower(world, x, y, z); ++ } ++ ++ @Deprecated //Changed return to float, see above. + public int getEnchantPower(World world, int x, int y, int z) + { + return blockID == bookShelf.blockID ? 1 : 0;