Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
77a5779e24
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2ec53f49 PR-1050: Fix empty result check for Complex Recipes 10671012 PR-1044: Add CrafterCraftEvent 4d87ffe0 Use correct method in JavaDoc ae5e5817 SPIGOT-7850: Add API for Bogged shear state 46b6d445 SPIGOT-7837: Support data pack banner patterns d5d0cefc Fix JavaDoc error b3c2b83d PR-1036: Add API for InventoryView derivatives 1fe2c75a SPIGOT-7809: Add ShieldMeta CraftBukkit Changes: 8ee6fd1b8 SPIGOT-7857: Improve ItemMeta block data deserialization 8f26c30c6 SPIGOT-7857: Fix spurious internal NBT tag when deserializing BlockStateMeta 759061b93 SPIGOT-7855: Fire does not spread or burn blocks 00fc9fb64 SPIGOT-7853: AnvilInventory#getRepairCost() always returns 0 7501e2e04 PR-1450: Add CrafterCraftEvent 8c51673e7 SPIGOT-5731: PortalCreateEvent#getEntity returns null for nether portals ignited by flint and steel d53d0d0b1 PR-1456: Fix inverted logic in CraftCrafterView#setSlotDisabled 682a678c8 SPIGOT-7850: Add API for Bogged shear state fccf5243a SPIGOT-7837: Support data pack banner patterns 9c3bd4390 PR-1431: Add API for InventoryView derivatives 0cc6acbc4 SPIGOT-7849: Fix FoodComponent serialize with "using-converts-to" using null 2c5474952 Don't rely on tags for CraftItemMetas 20d107e46 SPIGOT-7846: Fix ItemMeta for hanging signs 76f59e315 Remove redundant clone in Dropper InventoryMoveItemEvent e61a53d25 SPIGOT-7817: Call InventoryMoveItemEvent for Crafters 894682e2d SPIGOT-7839: Remove redundant Java version checks 2c12b2187 SPIGOT-7809: Add ShieldMeta and fix setting shield base colours Spigot Changes: fb8fb722 Rebuild patches 34bd42b7 SPIGOT-7835: Fix issue with custom hopper settings
62 Zeilen
3.3 KiB
Diff
62 Zeilen
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Thu, 11 Apr 2024 16:37:44 +0100
|
|
Subject: [PATCH] Fix premature player kicks on shutdown
|
|
|
|
When the server is stopping, the default execution handler method will throw a
|
|
RejectedExecutionException in order to prevent further execution, this causes
|
|
us to lose the actual kick reason. To mitigate this, we'll use a seperate marked
|
|
class in order to gracefully ignore these.
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/util/ServerStopRejectedExecutionException.java b/src/main/java/io/papermc/paper/util/ServerStopRejectedExecutionException.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..2c5cd77103c5a33d4349ab6b9ee2d8378bb60eb4
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/util/ServerStopRejectedExecutionException.java
|
|
@@ -0,0 +1,20 @@
|
|
+package io.papermc.paper.util;
|
|
+
|
|
+import java.util.concurrent.RejectedExecutionException;
|
|
+
|
|
+public class ServerStopRejectedExecutionException extends RejectedExecutionException {
|
|
+ public ServerStopRejectedExecutionException() {
|
|
+ }
|
|
+
|
|
+ public ServerStopRejectedExecutionException(final String message) {
|
|
+ super(message);
|
|
+ }
|
|
+
|
|
+ public ServerStopRejectedExecutionException(final String message, final Throwable cause) {
|
|
+ super(message, cause);
|
|
+ }
|
|
+
|
|
+ public ServerStopRejectedExecutionException(final Throwable cause) {
|
|
+ super(cause);
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
|
|
index 4d9f1fc884050993287adfa4578a87da710623fb..a8dfe7a4b3d01bf75587be078f471d1ef1d7a667 100644
|
|
--- a/src/main/java/net/minecraft/network/Connection.java
|
|
+++ b/src/main/java/net/minecraft/network/Connection.java
|
|
@@ -285,6 +285,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
|
Connection.genericsFtw(packet, packetlistener);
|
|
} catch (RunningOnDifferentThreadException cancelledpackethandleexception) {
|
|
;
|
|
+ } catch (io.papermc.paper.util.ServerStopRejectedExecutionException ignored) { // Paper - do not prematurely disconnect players on stop
|
|
} catch (RejectedExecutionException rejectedexecutionexception) {
|
|
this.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown"));
|
|
} catch (ClassCastException classcastexception) {
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 3aba668f9a34cabc26063c61660ab22f83b1070e..a72b278826be1d0da79ca619ea9a9a437fa9c54b 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -2093,7 +2093,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
@Override
|
|
public void executeIfPossible(Runnable runnable) {
|
|
if (this.isStopped()) {
|
|
- throw new RejectedExecutionException("Server already shutting down");
|
|
+ throw new io.papermc.paper.util.ServerStopRejectedExecutionException("Server already shutting down"); // Paper - do not prematurely disconnect players on stop
|
|
} else {
|
|
super.executeIfPossible(runnable);
|
|
}
|