2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dmitry Sidorov <jonmagon@gmail.com>
|
|
|
|
|
Date: Thu, 4 Feb 2021 20:32:01 +0300
|
|
|
|
|
Subject: [PATCH] Drop carried item when player has disconnected
|
|
|
|
|
|
|
|
|
|
Fixes disappearance of held items, when a player gets disconnected and PlayerDropItemEvent is cancelled.
|
|
|
|
|
Closes #5036
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index e80e6e402ae286358b7f26073329b2e10604153b..6ddcc928a49630e3a0f7f40cca496642419efa2c 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2024-10-27 18:11:15 +01:00
|
|
|
@@ -537,6 +537,14 @@ public abstract class PlayerList {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2024-01-23 14:34:17 +01:00
|
|
|
// Paper end - Configurable player collision
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
|
+ // Paper - Drop carried item when player has disconnected
|
2021-06-15 04:59:31 +02:00
|
|
|
+ if (!entityplayer.containerMenu.getCarried().isEmpty()) {
|
|
|
|
|
+ net.minecraft.world.item.ItemStack carried = entityplayer.containerMenu.getCarried();
|
|
|
|
|
+ entityplayer.containerMenu.setCarried(net.minecraft.world.item.ItemStack.EMPTY);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ entityplayer.drop(carried, false);
|
|
|
|
|
+ }
|
2024-01-19 17:54:05 +01:00
|
|
|
+ // Paper end - Drop carried item when player has disconnected
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
|
this.save(entityplayer);
|
|
|
|
|
if (entityplayer.isPassenger()) {
|
|
|
|
|
Entity entity = entityplayer.getRootVehicle();
|
