mirror of
https://github.com/PaperMC/Paper.git
synced 2025-05-07 16:01:24 +00:00
f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
34 lines
1.8 KiB
Diff
34 lines
1.8 KiB
Diff
--- a/net/minecraft/stats/ServerStatsCounter.java
|
|
+++ b/net/minecraft/stats/ServerStatsCounter.java
|
|
@@ -70,9 +_,21 @@
|
|
LOGGER.error("Couldn't parse statistics file {}", file, var5);
|
|
}
|
|
}
|
|
+ // Paper start - Moved after stat fetching for player state file
|
|
+ // Moves the loading after vanilla loading, so it overrides the values.
|
|
+ // Disables saving any forced stats, so it stays at the same value (without enabling disableStatSaving)
|
|
+ // Fixes stat initialization to not cause a NullPointerException
|
|
+ // Spigot start
|
|
+ for (Map.Entry<net.minecraft.resources.ResourceLocation, Integer> entry : org.spigotmc.SpigotConfig.forcedStats.entrySet()) {
|
|
+ Stat<net.minecraft.resources.ResourceLocation> wrapper = Stats.CUSTOM.get(java.util.Objects.requireNonNull(BuiltInRegistries.CUSTOM_STAT.getValue(entry.getKey()))); // Paper - ensured by SpigotConfig#stats
|
|
+ this.stats.put(wrapper, entry.getValue().intValue());
|
|
+ }
|
|
+ // Spigot end
|
|
+ // Paper end - Moved after stat fetching for player state file
|
|
}
|
|
|
|
public void save() {
|
|
+ if (org.spigotmc.SpigotConfig.disableStatSaving) return; // Spigot
|
|
try {
|
|
FileUtils.writeStringToFile(this.file, this.toJson());
|
|
} catch (IOException var2) {
|
|
@@ -82,6 +_,8 @@
|
|
|
|
@Override
|
|
public void setValue(Player player, Stat<?> stat, int i) {
|
|
+ if (org.spigotmc.SpigotConfig.disableStatSaving) return; // Spigot
|
|
+ if (stat.getType() == Stats.CUSTOM && stat.getValue() instanceof final net.minecraft.resources.ResourceLocation resourceLocation && org.spigotmc.SpigotConfig.forcedStats.get(resourceLocation) != null) return; // Paper - disable saving forced stats
|
|
super.setValue(player, stat, i);
|
|
this.dirty.add(stat);
|
|
}
|