diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/JsonList.java | |
parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/JsonList.java')
-rw-r--r-- | src/main/java/net/minecraft/server/JsonList.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java index 36dbcf62..9d1cb336 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -51,7 +51,7 @@ public class JsonList { } public void add(JsonListEntry jsonlistentry) { - this.d.put(this.a(jsonlistentry.f()), jsonlistentry); + this.d.put(this.a(jsonlistentry.getKey()), jsonlistentry); try { this.save(); @@ -85,7 +85,7 @@ public class JsonList { } // CraftBukkit end - public boolean d() { + public boolean isEmpty() { return this.d.size() < 1; } @@ -104,8 +104,8 @@ public class JsonList { while (iterator.hasNext()) { JsonListEntry jsonlistentry = (JsonListEntry) iterator.next(); - if (jsonlistentry.e()) { - arraylist.add(jsonlistentry.f()); + if (jsonlistentry.hasExpired()) { + arraylist.add(jsonlistentry.getKey()); } } @@ -157,8 +157,8 @@ public class JsonList { while (iterator.hasNext()) { JsonListEntry jsonlistentry = (JsonListEntry) iterator.next(); - if (jsonlistentry.f() != null) { - this.d.put(this.a(jsonlistentry.f()), jsonlistentry); + if (jsonlistentry.getKey() != null) { + this.d.put(this.a(jsonlistentry.getKey()), jsonlistentry); } } } |