Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -3,9 +3,9 @@
@@ -54,7 +54,7 @@
@Nullable
public V get(K k0) {
this.g();
- return (JsonListEntry) this.map.get(this.a(k0));
+ return (V) this.map.get(this.a(k0)); // CraftBukkit - fix decompile error
this.removeExpired();
- return (JsonListEntry) this.map.get(this.getKeyForUser(k0));
+ return (V) this.map.get(this.getKeyForUser(k0)); // CraftBukkit - fix decompile error
}
public void remove(K k0) {
@@ -30,7 +30,7 @@
+ V v0 = (V) iterator.next(); // CraftBukkit - decompile error
if (v0.hasExpired()) {
list.add(v0.getKey());
list.add(v0.getUser());
@@ -103,7 +109,7 @@
iterator = list.iterator();
@@ -38,9 +38,9 @@
- K k0 = iterator.next();
+ K k0 = (K) iterator.next(); // CraftBukkit - decompile error
this.map.remove(this.a(k0));
this.map.remove(this.getKeyForUser(k0));
}
@@ -118,11 +124,11 @@
@@ -118,7 +124,7 @@
public void save() throws IOException {
JsonArray jsonarray = new JsonArray();
@@ -49,17 +49,12 @@
JsonObject jsonobject = new JsonObject();
Objects.requireNonNull(jsonlistentry);
- return (JsonObject) SystemUtils.a((Object) jsonobject, jsonlistentry::a);
+ return (JsonObject) SystemUtils.a(jsonobject, jsonlistentry::a); // CraftBukkit - decompile error
});
Objects.requireNonNull(jsonarray);
@@ -165,7 +171,7 @@
JsonListEntry<K> jsonlistentry = this.a(jsonobject);
JsonListEntry<K> jsonlistentry = this.createEntry(jsonobject);
if (jsonlistentry.getKey() != null) {
- this.map.put(this.a(jsonlistentry.getKey()), jsonlistentry);
+ this.map.put(this.a(jsonlistentry.getKey()), (V) jsonlistentry); // CraftBukkit - fix decompile error
if (jsonlistentry.getUser() != null) {
- this.map.put(this.getKeyForUser(jsonlistentry.getUser()), jsonlistentry);
+ this.map.put(this.getKeyForUser(jsonlistentry.getUser()), (V) jsonlistentry); // CraftBukkit - decompile error
}
}
} catch (Throwable throwable) {