Paper/Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch

48 lines
2.4 KiB
Diff
Raw Normal View History

2018-07-23 08:39:55 +00:00
From cecf8ef12df4777c1c8f69f7f6420609a352b043 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 20 Dec 2016 23:09:21 -0600
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
2018-07-23 08:39:55 +00:00
index 459c86bce2..ea6fcb39f4 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -262,4 +262,13 @@ public class PaperConfig {
maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
}
}
+
+ public static boolean removeInvalidStatistics = false;
+ private static void removeInvalidStatistics() {
+ 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
2018-07-23 08:39:55 +00:00
index 07e7db455b..34c57e26f4 100644
--- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
2018-07-17 20:32:05 +00:00
@@ -83,6 +83,7 @@ public class ServerStatisticManager extends StatisticManager {
try {
JsonReader jsonreader = new JsonReader(new StringReader(s));
Throwable throwable = null;
+ java.util.List<String> invalidStats = com.google.common.collect.Lists.newArrayList(); // Paper
2018-07-17 20:32:05 +00:00
try {
jsonreader.setLenient(false);
@@ -118,6 +119,7 @@ public class ServerStatisticManager extends StatisticManager {
2018-07-17 20:32:05 +00:00
if (statistic == null) {
ServerStatisticManager.b.warn("Invalid statistic in {}: Don\'t know what {} is", this.d, s2);
+ if (com.destroystokyo.paper.PaperConfig.removeInvalidStatistics) invalidStats.add(s2); // Paper
} else {
this.a.put(statistic, nbttagcompound2.getInt(s2));
}
--
2.18.0