50 Zeilen
2.7 KiB
Diff
50 Zeilen
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: The456gamer <the456gamer@the456gamer.dev>
|
|
Date: Mon, 28 Aug 2023 01:32:39 +0100
|
|
Subject: [PATCH] Fix spigot's Forced-Stats
|
|
|
|
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
|
|
|
|
diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
|
|
index 9501e5f25f5c4d3069e554d4dc82b0e094156682..9bb8d4d7be6a937980aa653db82be084d066a563 100644
|
|
--- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
|
|
+++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
|
|
@@ -48,13 +48,6 @@ public class ServerStatsCounter extends StatsCounter {
|
|
public ServerStatsCounter(MinecraftServer server, File file) {
|
|
this.server = server;
|
|
this.file = file;
|
|
- // Spigot start
|
|
- for ( Map.Entry<ResourceLocation, Integer> entry : org.spigotmc.SpigotConfig.forcedStats.entrySet() )
|
|
- {
|
|
- Stat<ResourceLocation> wrapper = Stats.CUSTOM.get( entry.getKey() );
|
|
- this.stats.put( wrapper, entry.getValue().intValue() );
|
|
- }
|
|
- // Spigot end
|
|
if (file.isFile()) {
|
|
try {
|
|
this.parseLocal(server.getFixerUpper(), FileUtils.readFileToString(file));
|
|
@@ -65,6 +58,13 @@ public class ServerStatsCounter extends StatsCounter {
|
|
}
|
|
}
|
|
|
|
+ // Spigot start // Paper start - moved after stat fetching for player state file.
|
|
+ for ( Map.Entry<ResourceLocation, Integer> entry : org.spigotmc.SpigotConfig.forcedStats.entrySet() )
|
|
+ {
|
|
+ Stat<ResourceLocation> wrapper = Stats.CUSTOM.get(java.util.Objects.requireNonNull(BuiltInRegistries.CUSTOM_STAT.get(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() {
|
|
@@ -80,6 +80,7 @@ public class ServerStatsCounter extends StatsCounter {
|
|
@Override
|
|
public void setValue(Player player, Stat<?> stat, int value) {
|
|
if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot
|
|
+ if (stat.getType() == Stats.CUSTOM && stat.getValue() instanceof final ResourceLocation resourceLocation && org.spigotmc.SpigotConfig.forcedStats.get(resourceLocation) != null) return; // Paper - disable saving forced stats
|
|
super.setValue(player, stat, value);
|
|
this.dirty.add(stat);
|
|
}
|