mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Minecraft 1.17.1 (#6097)

Browse source
This commit is contained in:
Nassim Jahnke 2021-07-07 08:52:40 +02:00 • committed by GitHub
parent a831634d44
commit 56fd1a2f84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
266 changed files with 1415 additions and 1491 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Use a Queue for Queueing Commands
Lists are bad as Queues mmmkay.
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 45ae21718df16e16b5a3835a92afbf714959950e..6f9b7c3cf22d0c44f31b81bcbfa3cb1f8c065083 100644
index 967552df9d5ae7e58bb39127e1adb51bbf49dc28..047ec5fe63789fb0ac003ecee641542f5e9cba2f 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -78,7 +78,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -79,7 +79,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
private static final int CONVERSION_RETRY_DELAY_MS = 5000;
private static final int CONVERSION_RETRIES = 2;
private static final Pattern SHA1 = Pattern.compile("^[a-fA-F0-9]{40}$");
@ -18,7 +18,7 @@ index 45ae21718df16e16b5a3835a92afbf714959950e..6f9b7c3cf22d0c44f31b81bcbfa3cb1f
private QueryThreadGs4 queryThreadGs4;
public final RconConsoleSource rconConsoleSource;
private RconThread rconThread;
@@ -473,13 +473,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -475,13 +475,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
public void handleConsoleInput(String command, CommandSourceStack commandSource) {