papermc/CraftBukkit-Patches/0084-Allow-statistics-to-be-disabled-forced.patch

95 lines
3.7 KiB
Diff
Raw Normal View History

2014-03-23 00:06:43 +00:00
From d8d5882a6243d30cbc331101926fd05c55e43e68 Mon Sep 17 00:00:00 2001
2014-01-08 22:00:00 +00:00
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
2014-03-23 00:06:43 +00:00
index 0becb94..b868d08 100644
2014-01-08 22:00:00 +00:00
--- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
+++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -32,6 +32,14 @@ public class ServerStatisticManager extends StatisticManager {
public ServerStatisticManager(MinecraftServer minecraftserver, File file1) {
this.c = minecraftserver;
this.d = file1;
+ // Spigot start
+ for ( String name : org.spigotmc.SpigotConfig.forcedStats.keySet() )
+ {
+ StatisticWrapper wrapper = new StatisticWrapper();
+ wrapper.a( org.spigotmc.SpigotConfig.forcedStats.get( name ) );
2014-03-23 00:06:43 +00:00
+ a.put( StatisticList.getStatistic( name ), wrapper );
2014-01-08 22:00:00 +00:00
+ }
+ // Spigot end
}
public void a() {
@@ -48,6 +56,7 @@ public class ServerStatisticManager extends StatisticManager {
}
public void b() {
+ if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot
try {
FileUtils.writeStringToFile(this.d, a(this.a));
} catch (IOException ioexception) {
@@ -56,6 +65,7 @@ public class ServerStatisticManager extends StatisticManager {
}
2014-03-23 00:06:43 +00:00
public void setStatistic(EntityHuman entityhuman, Statistic statistic, int i) {
2014-01-08 22:00:00 +00:00
+ if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot
2014-03-23 00:06:43 +00:00
int j = statistic.d() ? this.getStatisticValue(statistic) : 0;
2014-01-08 22:00:00 +00:00
2014-03-23 00:06:43 +00:00
super.setStatistic(entityhuman, statistic, i);
2014-01-08 22:00:00 +00:00
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
2014-02-12 13:48:26 +00:00
index 69306cb..eaafc2d 100644
2014-01-08 22:00:00 +00:00
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
2014-02-12 13:48:26 +00:00
@@ -10,10 +10,13 @@ import java.util.HashMap;
2014-01-08 22:00:00 +00:00
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
+import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
2014-01-22 08:19:39 +00:00
public class SpigotConfig
2014-02-12 13:48:26 +00:00
@@ -203,4 +206,31 @@ public class SpigotConfig
2014-01-08 22:00:00 +00:00
private static void lateBind() {
lateBind = getBoolean( "settings.late-bind", false );
}
+
+ public static boolean disableStatSaving;
+ public static TObjectIntHashMap<String> forcedStats = new TObjectIntHashMap<String>();
+ private static void stats()
+ {
+ disableStatSaving = getBoolean( "stats.disable-saving", false );
+
+ if ( !config.contains( "stats.forced-stats" ) ) {
+ config.createSection( "stats.forced-stats" );
+ }
+
+ ConfigurationSection section = config.getConfigurationSection( "stats.forced-stats" );
+ for ( String name : section.getKeys( true ) )
+ {
+ if ( section.isInt( name ) )
+ {
+ forcedStats.put( name, section.getInt( name ) );
+ }
+ }
+
+ if ( disableStatSaving && section.getInt( "achievement.openInventory", 0 ) < 1 )
+ {
+ Bukkit.getLogger().warning( "*** WARNING *** stats.disable-saving is true but stats.forced-stats.achievement.openInventory" +
+ " isn't set to 1. Disabling stat saving without forcing the achievement may cause it to get stuck on the player's " +
+ "screen." );
+ }
+ }
}
--
2014-03-23 00:06:43 +00:00
1.8.5.2.msysgit.0
2014-01-08 22:00:00 +00:00