Fix /purpur version command output

PurpurMC · Aug 1, 2019 · 45c96b8 · 45c96b8
1 parent f36bd4a
commit 45c96b8
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From f4f109e1a980f9de4939adae5bd88266311022af Mon Sep 17 00:00:00 2001
+From 1407c0bc0a49cbf984e239642fc928b8a38b3b3c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -8,19 +8,19 @@ Subject: [PATCH] Purpur config files
  .../net/minecraft/server/DedicatedServer.java |   9 +
  src/main/java/net/minecraft/server/World.java |   3 +
  src/main/java/net/pl3x/purpur/Metrics.java    | 598 ++++++++++++++++++
- .../java/net/pl3x/purpur/PurpurCommand.java   |  59 ++
+ .../java/net/pl3x/purpur/PurpurCommand.java   |  66 ++
  .../java/net/pl3x/purpur/PurpurConfig.java    | 133 ++++
  .../net/pl3x/purpur/PurpurWorldConfig.java    |  63 ++
  .../org/bukkit/craftbukkit/CraftServer.java   |   3 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 +
- 9 files changed, 878 insertions(+)
+ 9 files changed, 885 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5942c3438..750ca9727 100644
+index 5942c343..750ca972 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,10 +96,12 @@ public class PaperConfig {
@@ -37,7 +37,7 @@ index 5942c3438..750ca9727 100644
 
      static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index c1473330f..f438323be 100644
+index 6da54a64..0af08293 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -174,6 +174,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -57,7 +57,7 @@ index c1473330f..f438323be 100644
          // Paper end
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ee6474b18..c86c9d1ec 100644
+index b81b3744..9f657b01 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -97,6 +97,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -79,7 +79,7 @@ index ee6474b18..c86c9d1ec 100644
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
 new file mode 100644
-index 000000000..246eb8140
+index 00000000..246eb814
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/Metrics.java
 @@ -0,0 +1,598 @@
@@ -683,10 +683,10 @@ index 000000000..246eb8140
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
 new file mode 100644
-index 000000000..293ed7da5
+index 00000000..f8cf4ad2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,66 @@
 +package net.pl3x.purpur;
 +
 +import net.minecraft.server.MinecraftServer;
@@ -729,7 +729,7 @@ index 000000000..293ed7da5
 +            return false;
 +        }
 +
-+        if (args[0].equals("reload")) {
++        if (args[0].equalsIgnoreCase("reload")) {
 +            Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues.");
 +            Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
 +
@@ -743,12 +743,19 @@ index 000000000..293ed7da5
 +            Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Purpur config reload complete.");
 +        }
 +
++        else if (args[0].equalsIgnoreCase("version")) {
++            Command verCmd = org.bukkit.Bukkit.getServer().getCommandMap().getCommand("version");
++            if (verCmd != null) {
++                return verCmd.execute(sender, commandLabel, new String[0]);
++            }
++        }
++
 +        return true;
 +    }
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 000000000..b0f0040a4
+index 00000000..b0f0040a
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -0,0 +1,133 @@
@@ -887,7 +894,7 @@ index 000000000..b0f0040a4
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 000000000..30f11fe26
+index 00000000..30f11fe2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -0,0 +1,63 @@
@@ -955,7 +962,7 @@ index 000000000..30f11fe26
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2aaa89ef5..ad6260c79 100644
+index 162546f2..3fea9de6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -793,6 +793,7 @@ public final class CraftServer implements Server {
@@ -983,7 +990,7 @@ index 2aaa89ef5..ad6260c79 100644
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1fa81904d..2bc8773d4 100644
+index 1fa81904..2bc8773d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -137,6 +137,14 @@ public class Main {