From 8d9b291e966436c6b4f96b80b0067a51aa52d405 Mon Sep 17 00:00:00 2001 From: Tom Boshoven Date: Thu, 14 May 2020 16:03:46 -0400 Subject: [PATCH] Fixed tile entities persisting when switching between states that don't have TEs without changing the block. (#6673) --- patches/minecraft/net/minecraft/block/Block.java.patch | 2 +- patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 4aaad007c1..b045f3c267 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -58,7 +58,7 @@ @Deprecated public void func_196243_a(BlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, BlockState p_196243_4_, boolean p_196243_5_) { - if (this.func_149716_u() && p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c()) { -+ if (p_196243_1_.hasTileEntity() && p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c()) { ++ if (p_196243_1_.hasTileEntity() && (p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c() || !p_196243_4_.hasTileEntity())) { p_196243_2_.func_175713_t(p_196243_3_); } - diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch index 8e412c047d..f7002eb352 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch @@ -30,7 +30,7 @@ if (!this.field_76637_e.field_72995_K) { blockstate.func_196947_b(this.field_76637_e, p_177436_1_, p_177436_2_, p_177436_3_); - } else if (block1 != block && block1 instanceof ITileEntityProvider) { -+ } else if (block1 != block && blockstate.hasTileEntity()) { ++ } else if ((block1 != block || !p_177436_2_.hasTileEntity()) && blockstate.hasTileEntity()) { this.field_76637_e.func_175713_t(p_177436_1_); }