From 550c12f16acbd3001c977a54e5dbc0234014e65c Mon Sep 17 00:00:00 2001 From: Cryptite Date: Tue, 2 May 2023 14:29:53 -0500 Subject: [PATCH] Fixed missing echests in this patch --- .../0016-Alllow-opening-covered-chests.patch | 24 ----------- .../0016-Allow-opening-covered-chests.patch | 43 +++++++++++++++++++ 2 files changed, 43 insertions(+), 24 deletions(-) delete mode 100644 patches/server/0016-Alllow-opening-covered-chests.patch create mode 100644 patches/server/0016-Allow-opening-covered-chests.patch diff --git a/patches/server/0016-Alllow-opening-covered-chests.patch b/patches/server/0016-Alllow-opening-covered-chests.patch deleted file mode 100644 index ea0a131eb..000000000 --- a/patches/server/0016-Alllow-opening-covered-chests.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cryptite -Date: Tue, 18 Apr 2023 07:49:59 -0500 -Subject: [PATCH] Alllow opening covered chests - - -diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -index 5e22d175b1048a58802cdf64ac70a8b56329e915..0f15e574b5c0cc8648bc1c0a12f1c72aa8653724 100644 ---- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -@@ -355,9 +355,10 @@ public class ChestBlock extends AbstractChestBlock implements - } - - private static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) { -- BlockPos blockposition1 = pos.above(); -- -- return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); -+ return false; -+// BlockPos blockposition1 = pos.above(); -+// -+// return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); - } - - private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) { diff --git a/patches/server/0016-Allow-opening-covered-chests.patch b/patches/server/0016-Allow-opening-covered-chests.patch new file mode 100644 index 000000000..c74886c42 --- /dev/null +++ b/patches/server/0016-Allow-opening-covered-chests.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Tue, 18 Apr 2023 07:49:59 -0500 +Subject: [PATCH] Allow opening covered chests + + +diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java +index 5e22d175b1048a58802cdf64ac70a8b56329e915..0f15e574b5c0cc8648bc1c0a12f1c72aa8653724 100644 +--- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java +@@ -355,9 +355,10 @@ public class ChestBlock extends AbstractChestBlock implements + } + + private static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) { +- BlockPos blockposition1 = pos.above(); +- +- return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); ++ return false; ++// BlockPos blockposition1 = pos.above(); ++// ++// return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); + } + + private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) { +diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +index 7385e91f32f070e86a4e0fd3d214f55d832c7979..4911b099f865b9202286f51087e5c00ffeaa95a5 100644 +--- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java +@@ -76,10 +76,10 @@ public class EnderChestBlock extends AbstractChestBlock i + PlayerEnderChestContainer playerEnderChestContainer = player.getEnderChestInventory(); + BlockEntity blockEntity = world.getBlockEntity(pos); + if (playerEnderChestContainer != null && blockEntity instanceof EnderChestBlockEntity) { +- BlockPos blockPos = pos.above(); +- if (world.getBlockState(blockPos).isRedstoneConductor(world, blockPos)) { +- return InteractionResult.sidedSuccess(world.isClientSide); +- } else if (world.isClientSide) { ++// BlockPos blockPos = pos.above(); ++// if (world.getBlockState(blockPos).isRedstoneConductor(world, blockPos)) { ++// return InteractionResult.sidedSuccess(world.isClientSide); ++ if (world.isClientSide) { + return InteractionResult.SUCCESS; + } else { + EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity;