Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/StatisticManager.java 2014-11-28 17:43:43.381707429 +0000
+++ src/main/java/net/minecraft/server/StatisticManager.java 2014-11-28 17:38:19.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/StatisticManager.java 2015-02-26 22:40:23.111608134 +0000
+++ src/main/java/net/minecraft/server/StatisticManager.java 2015-02-26 22:40:23.111608134 +0000
@@ -19,6 +19,12 @@
public void b(EntityHuman entityhuman, Statistic statistic, int i) {
@@ -13,3 +13,12 @@
this.setStatistic(entityhuman, statistic, this.getStatisticValue(statistic) + i);
}
}
@@ -43,7 +49,7 @@
public <T extends IJsonStatistic> T b(Statistic statistic) {
StatisticWrapper statisticwrapper = (StatisticWrapper) this.a.get(statistic);
- return statisticwrapper != null ? statisticwrapper.b() : null;
+ return statisticwrapper != null ? (T) statisticwrapper.b() : null; // CraftBukkit - fix decompile error
}
public <T extends IJsonStatistic> T a(Statistic statistic, T t0) {