From 34ea120258b98aca6bdef2e938a15c00b579f622 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 19 Mar 2012 10:30:21 -0700 Subject: [PATCH] Fixed tile entities not properly being removed for blocks that do not extend BlockContainer, or override BlockContainer.onBlockRemoval --- forge/patches/minecraft/net/minecraft/src/Chunk.java.patch | 2 +- .../patches/minecraft_server/net/minecraft/src/Chunk.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 463513000..49fd32f42 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -5,7 +5,7 @@ Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12); } - else if (Block.blocksList[var8] instanceof BlockContainer && var8 != par4) -+ else if (Block.blocksList[var8] != null && Block.blocksList[var8].hasTileEntity(getBlockMetadata(par1, par2, par3))) ++ if (Block.blocksList[var8] != null && Block.blocksList[var8].hasTileEntity(getBlockMetadata(par1, par2, par3))) { this.worldObj.removeBlockTileEntity(var11, par2, var12); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 2c950b93e..d8792aac6 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -5,7 +5,7 @@ Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12); } - else if (Block.blocksList[var8] instanceof BlockContainer && var8 != par4) -+ else if (Block.blocksList[var8] != null && Block.blocksList[var8].hasTileEntity(getBlockMetadata(par1, par2, par3))) ++ if (Block.blocksList[var8] != null && Block.blocksList[var8].hasTileEntity(getBlockMetadata(par1, par2, par3))) { this.worldObj.removeBlockTileEntity(var11, par2, var12); }