From b5fafd61d1c959ff661c1ba89088506f222d1748 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 11 Feb 2025 13:51:11 +0800 Subject: [PATCH] Fix incorrect player death check in AbstractContainerMenu --- .../world/inventory/AbstractContainerMenu.java.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 folia-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch diff --git a/folia-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch b/folia-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch new file mode 100644 index 0000000..2bd8ac2 --- /dev/null +++ b/folia-server/minecraft-patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/inventory/AbstractContainerMenu.java ++++ b/net/minecraft/world/inventory/AbstractContainerMenu.java +@@ -679,7 +_,7 @@ + } + + private static void dropOrPlaceInInventory(Player player, ItemStack stack) { +- boolean flag = player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION; ++ boolean flag = !player.isAlive(); // player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION; // Folia - region threading + boolean flag1 = player instanceof ServerPlayer serverPlayer && serverPlayer.hasDisconnected(); + if (flag || flag1) { + player.drop(stack, false);