44 lines
2.3 KiB
Diff
44 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
Date: Mon, 13 May 2019 21:10:59 -0700
|
||
|
|
Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
|
||
|
|
isMainThread
|
||
|
|
|
||
|
|
md_5 changed it so he could shut down the server asynchronously
|
||
|
|
from watchdog, although we have patches that prevent that type
|
||
|
|
of behavior for this exact reason.
|
||
|
|
|
||
|
|
md_5 also placed code in PlayerConnectionUtils that would have
|
||
|
|
solved https://bugs.mojang.com/browse/MC-142590, making the change
|
||
|
|
to MinecraftServer#isMainThread irrelevant.
|
||
|
|
By reverting his change to MinecraftServer#isMainThread packet
|
||
|
|
handling that should have been handled synchronously will be handled
|
||
|
|
synchronously when the server gets shut down.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
index 35984c7e994570a909ed4ffaabe64ae941b15e71..9beda5e429b5c520a41d9c7f536dc48dbb6f6f9e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
@@ -2190,7 +2190,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
// CraftBukkit start
|
||
|
|
@Override
|
||
|
|
public boolean isSameThread() {
|
||
|
|
- return super.isSameThread() || this.isStopped(); // CraftBukkit - MC-142590
|
||
|
|
+ return super.isSameThread() /*|| this.isStopped()*/; // CraftBukkit - MC-142590 // Paper - causes issues elsewhere
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean isDebugging() {
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
index 590687d5941cbed3a330bcd749f8d52cd4b5e3ae..96a3a4d89df858d4e46a36f110dd9ad3a2061433 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -1839,7 +1839,7 @@ public final class CraftServer implements Server {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public boolean isPrimaryThread() {
|
||
|
|
- return Thread.currentThread().equals(console.serverThread) || console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog)
|
||
|
|
+ return Thread.currentThread().equals(console.serverThread); // Paper - Fix issues with detecting main thread properly
|
||
|
|
}
|
||
|
|
|
||
|
|
// Paper start
|