keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix NPE when breaking ice.

Browse source
This commit is contained in:
Lex Manos 2014-01-29 15:43:13 -08:00
parent 3059e517c5
commit 0d84da021f
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
patches/minecraft/net/minecraft/block/Block.java.patch
View file

@ -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_) 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_.addStat(StatList.mineBlockStatArray[func_149682_b(this)], 1);
p_149636_2_.addExhaustion(0.025F); p_149636_2_.addExhaustion(0.025F);
@ -182,11 +182,12 @@
protected boolean func_149700_E() protected boolean func_149700_E()
{ {
- return this.func_149686_d() && !this.field_149758_A; - 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_) protected ItemStack func_149644_j(int p_149644_1_)
@@ -1114,6 +1147,1065 @@ @@ -1114,6 +1148,1065 @@
return null; return null;
} }

11
patches/minecraft/net/minecraft/block/BlockIce.java.patch Normal file
View file

@ -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_);