Skip to content

Commit b4682bf

Browse files
authored
Fix clicked items disappearing when player dies (#13002)
1 parent b685281 commit b4682bf

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

paper-server/patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
player.handleCreativeModeItemDrop(itemStack);
202202
}
203203
}
204-
@@ -595,8 +_,9 @@
204+
@@ -595,14 +_,15 @@
205205
if (player instanceof ServerPlayer) {
206206
ItemStack carried = this.getCarried();
207207
if (!carried.isEmpty()) {
@@ -212,6 +212,13 @@
212212
}
213213
}
214214
}
215+
216+
private static void dropOrPlaceInInventory(final Player player, final ItemStack carried) {
217+
- boolean playerRemovedNotChangingDimension = player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION;
218+
+ boolean playerRemovedNotChangingDimension = !player.isAlive() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION; // Paper - Make sure player is dead (https://github.com/PaperMC/Paper/pull/13002)
219+
boolean serverPlayerHasDisconnected = player instanceof ServerPlayer serverPlayer && serverPlayer.hasDisconnected();
220+
if (playerRemovedNotChangingDimension || serverPlayerHasDisconnected) {
221+
player.drop(carried, false);
215222
@@ -642,6 +_,14 @@
216223
public abstract boolean stillValid(Player player);
217224

0 commit comments

Comments
 (0)