From 3410e9035df7ec60d5f13df25a778cfa08bc7b19 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 27 Dec 2016 19:23:18 -0600
Subject: [PATCH] Make invalid stat removal use proper config key

Server-wide static config values should always be prefixed by
`settings.`. Get it right @Zbob750, geez

Issue introduced in f88edb00e9632a27c0a45a88a592a3a1d0a94255
---
 ...Add-option-to-remove-invalid-statistics.patch | 10 +++++++---
 Spigot-Server-Patches/Paper-config-files.patch   | 16 ++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
index 97c62b6853..7f01eab538 100644
--- a/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 668b375e1..569a1a9ab 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -15,11 +15,15 @@ index 668b375e1..569a1a9ab 100644
 +
 +    public static boolean removeInvalidStatistics = false;
 +    private static void removeInvalidStatistics() {
-+        removeInvalidStatistics = getBoolean("remove-invalid-statistics", false);
++        if (version < 12) {
++            boolean oldValue = getBoolean("remove-invalid-statistics", false);
++            set("settings.remove-invalid-statistics", oldValue);
++        }
++        removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 99466dbde..d1bee0257 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {
diff --git a/Spigot-Server-Patches/Paper-config-files.patch b/Spigot-Server-Patches/Paper-config-files.patch
index 7eb65e34d5..69e5e3bffd 100644
--- a/Spigot-Server-Patches/Paper-config-files.patch
+++ b/Spigot-Server-Patches/Paper-config-files.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 000000000..3d0a00512
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@
@@ -66,8 +66,8 @@ index 000000000..3d0a00512
 +
 +        commands = new HashMap<String, Command>();
 +
-+        version = getInt("config-version", 11);
-+        set("config-version", 11);
++        version = getInt("config-version", 12);
++        set("config-version", 12);
 +        readConfig(PaperConfig.class, null);
 +    }
 +
@@ -176,7 +176,7 @@ index 000000000..3d0a00512
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 new file mode 100644
-index 000000000..dae60dcce
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@
@@ -253,7 +253,7 @@ index 000000000..dae60dcce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7336aed80..c6a834580 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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
@@ -268,7 +268,7 @@ index 7336aed80..c6a834580 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a32abf0fa..dcd6fc13f 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
@@ -289,7 +289,7 @@ index a32abf0fa..dcd6fc13f 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 50799950f..f4b0871ed 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -316,7 +316,7 @@ index 50799950f..f4b0871ed 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 21170f377..30b6f3477 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {