1 files changed, 17 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ExpirableListEntry.java b/src/main/java/net/minecraft/server/ExpirableListEntry.java
index 7b41cab8..85819148 100644
--- a/src/main/java/net/minecraft/server/ExpirableListEntry.java
+++ b/src/main/java/net/minecraft/server/ExpirableListEntry.java
@@ -23,7 +23,7 @@ public abstract class ExpirableListEntry extends JsonListEntry {
     }
 
     protected ExpirableListEntry(Object object, JsonObject jsonobject) {
-        super(object, jsonobject);
+        super(checkExpiry(object, jsonobject), jsonobject); // CraftBukkit - check expiry
 
         Date date;
 
@@ -75,5 +75,21 @@ public abstract class ExpirableListEntry extends JsonListEntry {
     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
 }