From 0d84da021f8bcc89872cbbb1dc1f0d34f990050a Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 29 Jan 2014 15:43:13 -0800 Subject: [PATCH] Fix NPE when breaking ice. --- .../minecraft/net/minecraft/block/Block.java.patch | 7 ++++--- .../minecraft/net/minecraft/block/BlockIce.java.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 patches/minecraft/net/minecraft/block/BlockIce.java.patch diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 32ebbb1e41..5498b07264 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -148,7 +148,7 @@ } public boolean func_149727_a(World p_149727_1_, int p_149727_2_, int p_149727_3_, int p_149727_4_, EntityPlayer p_149727_5_, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) -@@ -920,25 +944,34 @@ +@@ -920,25 +944,35 @@ p_149636_2_.addStat(StatList.mineBlockStatArray[func_149682_b(this)], 1); p_149636_2_.addExhaustion(0.025F); @@ -182,11 +182,12 @@ protected boolean func_149700_E() { - return this.func_149686_d() && !this.field_149758_A; -+ return this.func_149686_d() && !this.hasTileEntity(silk_check_meta.get()); ++ Integer meta = silk_check_meta.get(); ++ return this.func_149686_d() && !this.hasTileEntity(meta == null ? 0 : meta); } protected ItemStack func_149644_j(int p_149644_1_) -@@ -1114,6 +1147,1065 @@ +@@ -1114,6 +1148,1065 @@ return null; } diff --git a/patches/minecraft/net/minecraft/block/BlockIce.java.patch b/patches/minecraft/net/minecraft/block/BlockIce.java.patch new file mode 100644 index 0000000000..3d2641e629 --- /dev/null +++ b/patches/minecraft/net/minecraft/block/BlockIce.java.patch @@ -0,0 +1,11 @@ +--- ../src-base/minecraft/net/minecraft/block/BlockIce.java ++++ ../src-work/minecraft/net/minecraft/block/BlockIce.java +@@ -43,7 +43,7 @@ + p_149636_2_.addStat(StatList.mineBlockStatArray[Block.func_149682_b(this)], 1); + p_149636_2_.addExhaustion(0.025F); + +- if (this.func_149700_E() && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) ++ if (this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) + { + ItemStack itemstack = this.func_149644_j(p_149636_6_); +