mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-25 05:44:45 +01:00
[Auto] Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
26c89277
SPIGOT-4385: Clearer error for invalid generator-settings
This commit is contained in:
parent
06cbabf778
commit
8e847f5300
3 changed files with 3 additions and 3 deletions
|
@ -476,7 +476,7 @@ index 4d7e15179..40ff72f72 100644
|
|||
int j = 0;
|
||||
CustomFunction.c[] acustomfunction_c = customfunction.b();
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index efa738d4e..dabad6b05 100644
|
||||
index d8535fdd9..22f3a08e9 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Level;
|
||||
|
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
|
|||
Lists are bad as Queues mmmkay.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index c4e99ef2a9..98d3bad378 100644
|
||||
index 1a332909b..9ad5d9dc6 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit a222e4a252012ef3b5d6b711f723749ccc14a240
|
||||
Subproject commit 26c89277cb772e7d163941397d0b4db4aac6cea1
|
Loading…
Add table
Reference in a new issue