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,11 +1,11 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ExpirableListEntry.java 2014-11-28 17:43:43.189707433 +0000
+++ src/main/java/net/minecraft/server/ExpirableListEntry.java 2014-11-28 17:38:21.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/ExpirableListEntry.java 2015-02-26 22:40:22.743608138 +0000
+++ src/main/java/net/minecraft/server/ExpirableListEntry.java 2015-02-26 22:40:22.743608138 +0000
@@ -22,7 +22,7 @@
}
protected ExpirableListEntry(Object object, JsonObject jsonobject) {
- super(object, jsonobject);
+ super(checkExpiry(object, jsonobject), jsonobject);
protected ExpirableListEntry(T t0, JsonObject jsonobject) {
- super(t0, jsonobject);
+ super(checkExpiry(t0, jsonobject), jsonobject);
Date date;
@@ -23,7 +23,7 @@
+ return this.b;
+ }
+
+ private static Object checkExpiry(Object object, JsonObject jsonobject) {
+ private static <T> T checkExpiry(T object, JsonObject jsonobject) {
+ Date expires = null;
+
+ try {