SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.7.5

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0084-Allow-statistics-to-be-disabled-forced.patch
View File

@@ -1,11 +1,11 @@
From cc9fe7c36fb75ad75e4a7ffeea8a31c963b037b6 Mon Sep 17 00:00:00 2001
From d8d5882a6243d30cbc331101926fd05c55e43e68 Mon Sep 17 00:00:00 2001
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
index 2f980cb..3f78728 100644
index 0becb94..b868d08 100644
--- 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 {
@@ -17,7 +17,7 @@ index 2f980cb..3f78728 100644
+ {
+ StatisticWrapper wrapper = new StatisticWrapper();
+ wrapper.a( org.spigotmc.SpigotConfig.forcedStats.get( name ) );
+ a.put( StatisticList.a( name ), wrapper );
+ a.put( StatisticList.getStatistic( name ), wrapper );
+ }
+ // Spigot end
}
@@ -34,11 +34,11 @@ index 2f980cb..3f78728 100644
@@ -56,6 +65,7 @@ public class ServerStatisticManager extends StatisticManager {
}
public void a(EntityHuman entityhuman, Statistic statistic, int i) {
public void setStatistic(EntityHuman entityhuman, Statistic statistic, int i) {
+ if ( org.spigotmc.SpigotConfig.disableStatSaving ) return; // Spigot
int j = statistic.d() ? this.a(statistic) : 0;
int j = statistic.d() ? this.getStatisticValue(statistic) : 0;
super.a(entityhuman, statistic, i);
super.setStatistic(entityhuman, statistic, i);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 69306cb..eaafc2d 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
@@ -90,5 +90,5 @@ index 69306cb..eaafc2d 100644
+ }
}
--
1.8.3.2
1.8.5.2.msysgit.0