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

Fix issue where non-BlockContainer TEs would not be removed properly.

Browse source
This commit is contained in:
LexManos 2012-11-30 20:22:50 -08:00
parent e65c0a3d88
commit 0243df1c4a
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
patches/common/net/minecraft/src/Block.java.patch
View file

@ -60,7 +60,22 @@
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@@ -633,8 +645,7 @@ @@ -609,7 +621,13 @@
/**
* ejects contained items into the world, and notifies neighbours of an update, as appropriate
*/
- public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) {}
+ public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6)
+ {
+ if (hasTileEntity(par6) && !(this instanceof BlockContainer))
+ {
+ par1World.removeBlockTileEntity(par2, par3, par4);
+ }
+ }
/**
* Returns the quantity of items to drop on block destruction.
@@ -633,8 +651,7 @@
*/ */
public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, World par2World, int par3, int par4, int par5) public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, World par2World, int par3, int par4, int par5)
{ {
@ -70,7 +85,7 @@
} }
/** /**
@@ -652,18 +663,13 @@ @@ -652,18 +669,13 @@
{ {
if (!par1World.isRemote) if (!par1World.isRemote)
{ {
@ -93,7 +108,7 @@
} }
} }
} }
@@ -1048,7 +1054,7 @@ @@ -1048,7 +1060,7 @@
par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1); par2EntityPlayer.addStat(StatList.mineBlockStatArray[this.blockID], 1);
par2EntityPlayer.addExhaustion(0.025F); par2EntityPlayer.addExhaustion(0.025F);
@ -102,7 +117,7 @@
{ {
ItemStack var8 = this.createStackedBlock(par6); ItemStack var8 = this.createStackedBlock(par6);
@@ -1325,4 +1331,849 @@ @@ -1325,4 +1337,849 @@
canBlockGrass[0] = true; canBlockGrass[0] = true;
StatList.initBreakableStats(); StatList.initBreakableStats();
} }