Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4385: Clearer error for invalid generator-settings

Browse Source
This commit is contained in:
md_5 2018-09-19 18:32:21 +10:00
parent a222e4a252
commit 26c89277cb
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
nms-patches/DedicatedServer.patch
View File

@ -131,13 +131,28 @@
long j = SystemUtils.c(); long j = SystemUtils.c();
if (this.getWorld() == null) { if (this.getWorld() == null) {
@@ -228,7 +282,18 @@ @@ -204,7 +258,13 @@
if (worldtype == WorldType.FLAT) {
jsonobject.addProperty("flat_world_options", s2);
} else if (!s2.isEmpty()) {
- jsonobject = ChatDeserializer.a(s2);
+ // CraftBukkit start
+ try {
+ jsonobject = ChatDeserializer.a(s2);
+ } catch (Exception ex) {
+ DedicatedServer.LOGGER.warn("Invalid generator-settings, ignoring", ex);
+ }
+ // CraftBukkit end
}
this.a(this.getWorld(), this.getWorld(), k, worldtype, jsonobject);
@@ -228,8 +288,19 @@
DedicatedServer.LOGGER.info("Starting remote control listener"); DedicatedServer.LOGGER.info("Starting remote control listener");
this.l = new RemoteControlListener(this); this.l = new RemoteControlListener(this);
this.l.a(); this.l.a();
+ this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.remoteControlCommandListener); // CraftBukkit + this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.remoteControlCommandListener); // CraftBukkit
+ } }
+
+ // CraftBukkit start + // CraftBukkit start
+ if (this.server.getBukkitSpawnRadius() > -1) { + 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."); + 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.");
@ -145,12 +160,13 @@
+ this.propertyManager.getInt("spawn-protection", this.server.getBukkitSpawnRadius()); + this.propertyManager.getInt("spawn-protection", this.server.getBukkitSpawnRadius());
+ this.server.removeBukkitSpawnRadius(); + this.server.removeBukkitSpawnRadius();
+ this.propertyManager.savePropertiesFile(); + this.propertyManager.savePropertiesFile();
} + }
+ // CraftBukkit end + // CraftBukkit end
+
if (this.aY() > 0L) { if (this.aY() > 0L) {
Thread thread1 = new Thread(new ThreadWatchdog(this)); Thread thread1 = new Thread(new ThreadWatchdog(this));
@@ -303,11 +368,11 @@
@@ -303,11 +374,11 @@
return crashreport; return crashreport;
} }
@ -164,7 +180,7 @@
super.b(booleansupplier); super.b(booleansupplier);
this.aU(); this.aU();
} }
@@ -342,7 +407,15 @@ @@ -342,7 +413,15 @@
while (!this.serverCommandQueue.isEmpty()) { while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0); ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
@ -181,7 +197,7 @@
} }
} }
@@ -549,16 +622,75 @@ @@ -549,16 +628,75 @@
} }
public String getPlugins() { public String getPlugins() {
@ -202,17 +218,17 @@
+ if (i > 0) { + if (i > 0) {
+ result.append("; "); + result.append("; ");
+ } + }
+
- public String executeRemoteCommand(String s) {
- this.remoteControlCommandListener.clearMessages();
- this.getCommandDispatcher().a(this.remoteControlCommandListener.f(), s);
- return this.remoteControlCommandListener.getMessages();
+ result.append(plugins[i].getDescription().getName()); + result.append(plugins[i].getDescription().getName());
+ result.append(" "); + result.append(" ");
+ result.append(plugins[i].getDescription().getVersion().replaceAll(";", ",")); + result.append(plugins[i].getDescription().getVersion().replaceAll(";", ","));
+ } + }
+ } + }
+
- public String executeRemoteCommand(String s) {
- this.remoteControlCommandListener.clearMessages();
- this.getCommandDispatcher().a(this.remoteControlCommandListener.f(), s);
- return this.remoteControlCommandListener.getMessages();
+ return result.toString(); + return result.toString();
+ // CraftBukkit end + // CraftBukkit end
+ } + }