[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
Dieser Commit ist enthalten in:
Ursprung
1e66b061fa
Commit
a7e90f01fe
@ -1,4 +1,4 @@
|
|||||||
From 5cee08790d9d3bd321e9b29d41e454da135016c3 Mon Sep 17 00:00:00 2001
|
From a009ab52b37d6fa71fd1e65569d8eaa25fefebe9 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
||||||
Subject: [PATCH] Timings v2
|
Subject: [PATCH] Timings v2
|
||||||
@ -476,7 +476,7 @@ index 4d7e15179..40ff72f72 100644
|
|||||||
int j = 0;
|
int j = 0;
|
||||||
CustomFunction.c[] acustomfunction_c = customfunction.b();
|
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
|
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
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
|
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
|
||||||
@ -488,7 +488,7 @@ index efa738d4e..dabad6b05 100644
|
|||||||
import org.bukkit.event.server.ServerCommandEvent;
|
import org.bukkit.event.server.ServerCommandEvent;
|
||||||
import org.bukkit.craftbukkit.util.Waitable;
|
import org.bukkit.craftbukkit.util.Waitable;
|
||||||
import org.bukkit.event.server.RemoteServerCommandEvent;
|
import org.bukkit.event.server.RemoteServerCommandEvent;
|
||||||
@@ -443,7 +443,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@@ -449,7 +449,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||||
}
|
}
|
||||||
|
|
||||||
public void aU() {
|
public void aU() {
|
||||||
@ -497,7 +497,7 @@ index efa738d4e..dabad6b05 100644
|
|||||||
while (!this.serverCommandQueue.isEmpty()) {
|
while (!this.serverCommandQueue.isEmpty()) {
|
||||||
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
|
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
|
||||||
|
|
||||||
@@ -458,7 +458,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@@ -464,7 +464,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -506,7 +506,7 @@ index efa738d4e..dabad6b05 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean Q() {
|
public boolean Q() {
|
||||||
@@ -708,7 +708,20 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@@ -714,7 +714,20 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||||
return remoteControlCommandListener.getMessages();
|
return remoteControlCommandListener.getMessages();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From f1fdb755227722e5cb406941e482ad07dcc8f994 Mon Sep 17 00:00:00 2001
|
From 92ce659d44507fca507ace7feb482e5742a887ca Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 12 Aug 2018 02:33:39 -0400
|
Date: Sun, 12 Aug 2018 02:33:39 -0400
|
||||||
Subject: [PATCH] Use a Queue for Queueing Commands
|
Subject: [PATCH] Use a Queue for Queueing Commands
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
|
|||||||
Lists are bad as Queues mmmkay.
|
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
|
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
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
@@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||||
@ -18,7 +18,7 @@ index c4e99ef2a9..98d3bad378 100644
|
|||||||
private RemoteStatusListener j;
|
private RemoteStatusListener j;
|
||||||
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
|
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
|
||||||
private RemoteControlListener l;
|
private RemoteControlListener l;
|
||||||
@@ -457,8 +457,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@@ -463,8 +463,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||||
|
|
||||||
public void aU() {
|
public void aU() {
|
||||||
MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
|
MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
|
||||||
@ -32,5 +32,5 @@ index c4e99ef2a9..98d3bad378 100644
|
|||||||
// CraftBukkit start - ServerCommand for preprocessing
|
// CraftBukkit start - ServerCommand for preprocessing
|
||||||
ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
|
ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
|
||||||
--
|
--
|
||||||
2.18.0
|
2.19.0
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit a222e4a252012ef3b5d6b711f723749ccc14a240
|
Subproject commit 26c89277cb772e7d163941397d0b4db4aac6cea1
|
In neuem Issue referenzieren
Einen Benutzer sperren