43 Zeilen
1.3 KiB
Diff
43 Zeilen
1.3 KiB
Diff
--- ../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
|
|
@@ -22,7 +22,7 @@
|
|
}
|
|
|
|
protected ExpirableListEntry(Object object, JsonObject jsonobject) {
|
|
- super(object, jsonobject);
|
|
+ super(checkExpiry(object, jsonobject), jsonobject);
|
|
|
|
Date date;
|
|
|
|
@@ -65,4 +65,30 @@
|
|
jsonobject.addProperty("expires", this.d == null ? "forever" : ExpirableListEntry.a.format(this.d));
|
|
jsonobject.addProperty("reason", this.e);
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ public String getSource() {
|
|
+ return this.c;
|
|
+ }
|
|
+
|
|
+ public Date getCreated() {
|
|
+ return this.b;
|
|
+ }
|
|
+
|
|
+ private static Object checkExpiry(Object object, JsonObject jsonobject) {
|
|
+ Date expires = null;
|
|
+
|
|
+ try {
|
|
+ expires = jsonobject.has("expires") ? a.parse(jsonobject.get("expires").getAsString()) : null;
|
|
+ } catch (ParseException ex) {
|
|
+ // Guess we don't have a date
|
|
+ }
|
|
+
|
|
+ if (expires == null || expires.after(new Date())) {
|
|
+ return object;
|
|
+ } else {
|
|
+ return null;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|