Paper/nms-patches/DedicatedServer.patch

266 lines
12 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/DedicatedServer.java
+++ b/net/minecraft/server/DedicatedServer.java
2018-07-15 02:00:00 +02:00
@@ -23,11 +23,22 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import java.io.PrintStream;
+import org.apache.logging.log4j.Level;
+
2018-07-15 02:00:00 +02:00
+import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.LoggerOutputStream;
+import org.bukkit.event.server.ServerCommandEvent;
2015-02-26 23:41:06 +01:00
+import org.bukkit.craftbukkit.util.Waitable;
+import org.bukkit.event.server.RemoteServerCommandEvent;
+// CraftBukkit end
+
public class DedicatedServer extends MinecraftServer implements IMinecraftServer {
private static final Logger LOGGER = LogManager.getLogger();
2018-08-26 04:00:00 +02:00
private static final Pattern h = Pattern.compile("^[a-fA-F0-9]{40}$");
2016-02-29 22:32:46 +01:00
- private final List<ServerCommand> serverCommandQueue = Collections.synchronizedList(Lists.newArrayList());
+ private final List<ServerCommand> serverCommandQueue = Collections.synchronizedList(Lists.<ServerCommand>newArrayList()); // CraftBukkit - fix decompile error
2018-08-26 04:00:00 +02:00
private RemoteStatusListener j;
2016-02-29 22:32:46 +01:00
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
2018-08-26 04:00:00 +02:00
private RemoteControlListener l;
2018-07-15 02:00:00 +02:00
@@ -37,8 +48,10 @@
2018-08-26 04:00:00 +02:00
private EnumGamemode p;
private boolean q;
2016-02-29 22:32:46 +01:00
2018-07-15 02:00:00 +02:00
- public DedicatedServer(File file, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
- super(file, Proxy.NO_PROXY, datafixer, new CommandDispatcher(true), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
+ // CraftBukkit start - Signature changed
2018-07-15 02:00:00 +02:00
+ public DedicatedServer(joptsimple.OptionSet options, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
+ super(options, Proxy.NO_PROXY, datafixer, new CommandDispatcher().init(true), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
Thread thread = new Thread("Server Infinisleeper") {
{
this.setDaemon(true);
2018-07-15 02:00:00 +02:00
@@ -58,16 +71,30 @@
2016-06-09 03:43:49 +02:00
};
}
- protected boolean init() throws IOException {
2017-05-14 04:00:00 +02:00
+ public boolean init() throws IOException { // CraftBukkit - decompile error
2015-02-26 23:41:06 +01:00
Thread thread = new Thread("Server console handler") {
public void run() {
2017-05-14 04:00:00 +02:00
- BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.Main.useConsole) {
+ return;
+ }
2017-05-14 04:00:00 +02:00
+ jline.console.ConsoleReader bufferedreader = reader;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
String s;
try {
- while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning() && (s = bufferedreader.readLine()) != null) {
2018-07-15 02:00:00 +02:00
- DedicatedServer.this.issueCommand(s, DedicatedServer.this.getServerCommandListener());
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - JLine disabling compatibility
2018-07-15 02:00:00 +02:00
+ while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning()) {
2015-02-26 23:41:06 +01:00
+ if (org.bukkit.craftbukkit.Main.useJline) {
+ s = bufferedreader.readLine(">", null);
+ } else {
+ s = bufferedreader.readLine();
+ }
+ if (s != null && s.trim().length() > 0) { // Trim to filter lines which are just spaces
2018-07-15 02:00:00 +02:00
+ DedicatedServer.this.issueCommand(s, DedicatedServer.this.getServerCommandListener());
2015-02-26 23:41:06 +01:00
+ }
+ // CraftBukkit end
}
} catch (IOException ioexception) {
DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
2018-07-15 02:00:00 +02:00
@@ -76,6 +103,27 @@
2015-05-25 14:04:32 +02:00
}
};
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - TODO: handle command-line logging arguments
+ java.util.logging.Logger global = java.util.logging.Logger.getLogger("");
+ global.setUseParentHandlers(false);
+ for (java.util.logging.Handler handler : global.getHandlers()) {
+ global.removeHandler(handler);
+ }
+ global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler());
+
+ final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger());
+ for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) {
+ if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) {
+ logger.removeAppender(appender);
+ }
+ }
+
+ new Thread(new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader)).start();
+
+ System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
+ System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
+ // CraftBukkit end
+
2015-05-25 14:04:32 +02:00
thread.setDaemon(true);
2018-07-15 02:00:00 +02:00
thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER));
2015-05-25 14:04:32 +02:00
thread.start();
2018-07-15 02:00:00 +02:00
@@ -85,7 +133,7 @@
}
DedicatedServer.LOGGER.info("Loading properties");
- this.propertyManager = new PropertyManager(new File("server.properties"));
+ this.propertyManager = new PropertyManager(this.options); // CraftBukkit - CLI argument support
2018-08-26 04:00:00 +02:00
this.n = new EULA(new File("eula.txt"));
if (!this.n.a()) {
DedicatedServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
2018-07-15 02:00:00 +02:00
@@ -143,6 +191,12 @@
return false;
}
+ // CraftBukkit start
+ this.a((PlayerList) (new DedicatedPlayerList(this)));
+ server.loadPlugins();
+ server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
+ // CraftBukkit end
+
if (!this.getOnlineMode()) {
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
2018-07-15 02:00:00 +02:00
@@ -157,7 +211,7 @@
if (!NameReferencingFileConverter.a(this.propertyManager)) {
return false;
} else {
- this.a((PlayerList) (new DedicatedPlayerList(this)));
2018-07-15 02:00:00 +02:00
+ this.convertable = new WorldLoaderServer(server.getWorldContainer().toPath(), server.getWorldContainer().toPath().resolve("../backups"), this.dataConverterManager); // CraftBukkit - moved from MinecraftServer constructor
long j = SystemUtils.c();
2018-07-22 04:00:00 +02:00
if (this.getWorld() == null) {
2018-07-15 02:00:00 +02:00
@@ -228,7 +282,18 @@
DedicatedServer.LOGGER.info("Starting remote control listener");
2018-08-26 04:00:00 +02:00
this.l = new RemoteControlListener(this);
this.l.a();
2016-02-29 22:32:46 +01:00
+ this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.remoteControlCommandListener); // CraftBukkit
2015-05-25 14:04:32 +02:00
+ }
+
+ // CraftBukkit start
+ if (this.server.getBukkitSpawnRadius() > -1) {
+ DedicatedServer.LOGGER.info("'settings.spawn-radius' in bukkit.yml has been moved to 'spawn-protection' in server.properties. I will move your config for you.");
+ this.propertyManager.properties.remove("spawn-protection");
+ this.propertyManager.getInt("spawn-protection", this.server.getBukkitSpawnRadius());
+ this.server.removeBukkitSpawnRadius();
+ this.propertyManager.savePropertiesFile();
2015-05-25 14:04:32 +02:00
}
+ // CraftBukkit end
2015-05-25 14:04:32 +02:00
2018-08-26 04:00:00 +02:00
if (this.aY() > 0L) {
2015-02-26 23:41:06 +01:00
Thread thread1 = new Thread(new ThreadWatchdog(this));
2018-07-15 02:00:00 +02:00
@@ -303,11 +368,11 @@
2016-06-09 03:43:49 +02:00
return crashreport;
}
2018-08-26 04:00:00 +02:00
- protected void t() {
+ public void t() { // CraftBukkit - decompile error
2015-02-26 23:41:06 +01:00
System.exit(0);
}
2018-08-26 04:00:00 +02:00
- protected void b(BooleanSupplier booleansupplier) {
+ public void b(BooleanSupplier booleansupplier) { // CraftBukkit - fix decompile error
super.b(booleansupplier);
this.aU();
}
2018-07-15 02:00:00 +02:00
@@ -342,7 +407,15 @@
2016-02-29 22:32:46 +01:00
while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
2018-07-15 02:00:00 +02:00
- this.getCommandDispatcher().a(servercommand.source, servercommand.command);
+ // CraftBukkit start - ServerCommand for preprocessing
+ ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
+ server.getPluginManager().callEvent(event);
+ if (event.isCancelled()) continue;
+ servercommand = new ServerCommand(event.getCommand(), servercommand.source);
+
2018-07-15 02:00:00 +02:00
+ // this.getCommandDispatcher().a(servercommand.source, servercommand.command); // Called in dispatchServerCommand
+ server.dispatchServerCommand(console, servercommand);
+ // CraftBukkit end
}
}
2018-07-15 02:00:00 +02:00
@@ -549,16 +622,75 @@
2015-02-26 23:41:06 +01:00
}
public String getPlugins() {
- return "";
- }
+ // CraftBukkit start - Whole method
+ StringBuilder result = new StringBuilder();
+ org.bukkit.plugin.Plugin[] plugins = server.getPluginManager().getPlugins();
+
+ result.append(server.getName());
+ result.append(" on Bukkit ");
+ result.append(server.getBukkitVersion());
+
+ if (plugins.length > 0 && server.getQueryPlugins()) {
+ result.append(": ");
+
+ for (int i = 0; i < plugins.length; i++) {
+ if (i > 0) {
+ result.append("; ");
+ }
2018-07-15 02:00:00 +02:00
- public String executeRemoteCommand(String s) {
- this.remoteControlCommandListener.clearMessages();
- this.getCommandDispatcher().a(this.remoteControlCommandListener.f(), s);
- return this.remoteControlCommandListener.getMessages();
2016-07-15 12:08:04 +02:00
+ result.append(plugins[i].getDescription().getName());
+ result.append(" ");
+ result.append(plugins[i].getDescription().getVersion().replaceAll(";", ","));
+ }
+ }
2018-07-15 02:00:00 +02:00
+
2015-02-26 23:41:06 +01:00
+ return result.toString();
+ // CraftBukkit end
+ }
+
+ // CraftBukkit start - fire RemoteServerCommandEvent
+ public String executeRemoteCommand(final String s) {
+ Waitable<String> waitable = new Waitable<String>() {
+ @Override
+ protected String evaluate() {
2016-02-29 22:32:46 +01:00
+ remoteControlCommandListener.clearMessages();
2015-02-26 23:41:06 +01:00
+ // Event changes start
+ RemoteServerCommandEvent event = new RemoteServerCommandEvent(remoteConsole, s);
+ server.getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return "";
+ }
2015-02-26 23:41:06 +01:00
+ // Event change end
2018-07-15 02:00:00 +02:00
+ ServerCommand serverCommand = new ServerCommand(event.getCommand(), remoteControlCommandListener.f());
2015-02-26 23:41:06 +01:00
+ server.dispatchServerCommand(remoteConsole, serverCommand);
2016-02-29 22:32:46 +01:00
+ return remoteControlCommandListener.getMessages();
2015-02-26 23:41:06 +01:00
+ }
+ };
+ processQueue.add(waitable);
+ try {
+ return waitable.get();
+ } catch (java.util.concurrent.ExecutionException e) {
+ throw new RuntimeException("Exception processing rcon command " + s, e.getCause());
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt(); // Maintain interrupted state
+ throw new RuntimeException("Interrupted processing rcon command " + s, e);
+ }
+ // CraftBukkit end
}
public PlayerList getPlayerList() {
2018-08-26 04:00:00 +02:00
return this.aV();
2016-02-29 22:32:46 +01:00
}
+
+ // CraftBukkit start
+ @Override
+ public PropertyManager getPropertyManager() {
+ return this.propertyManager;
+ }
2018-07-15 02:00:00 +02:00
+
+ @Override
+ public CommandSender getBukkitSender(CommandListenerWrapper wrapper) {
+ return console;
+ }
2016-02-29 22:32:46 +01:00
+ // CraftBukkit end
}