Update to Minecraft 1.16.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/server/JsonList.java
+++ b/net/minecraft/server/JsonList.java
@@ -85,7 +85,7 @@
@@ -50,7 +50,7 @@
@Nullable
public V get(K k0) {
this.h();
this.g();
- return (JsonListEntry) this.d.get(this.a(k0));
+ return (V) this.d.get(this.a(k0)); // CraftBukkit - fix decompile error
}
public void remove(K k0) {
@@ -107,6 +107,12 @@
@@ -72,6 +72,12 @@
return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
}
@@ -22,7 +22,7 @@
public boolean isEmpty() {
return this.d.size() < 1;
}
@@ -124,7 +130,7 @@
@@ -89,7 +95,7 @@
Iterator iterator = this.d.values().iterator();
while (iterator.hasNext()) {
@@ -31,7 +31,7 @@
if (v0.hasExpired()) {
list.add(v0.getKey());
@@ -134,7 +140,7 @@
@@ -99,7 +105,7 @@
iterator = list.iterator();
while (iterator.hasNext()) {
@@ -40,21 +40,21 @@
this.d.remove(this.a(k0));
}
@@ -142,7 +148,7 @@
}
@@ -119,7 +125,7 @@
JsonObject jsonobject = new JsonObject();
protected JsonListEntry<K> a(JsonObject jsonobject) {
- return new JsonListEntry<>((Object) null, jsonobject);
+ return new JsonListEntry<>((K) null, jsonobject); // CraftBukkit - decompile error
}
jsonlistentry.getClass();
- return (JsonObject) SystemUtils.a((Object) jsonobject, jsonlistentry::a);
+ return (JsonObject) SystemUtils.a(jsonobject, jsonlistentry::a); // CraftBukkit - decompile error
}).forEach(jsonarray::add);
BufferedWriter bufferedwriter = Files.newWriter(this.c, StandardCharsets.UTF_8);
Throwable throwable = null;
@@ -163,7 +169,7 @@
JsonListEntry<K> jsonlistentry = this.a(jsonobject);
public Collection<V> e() {
@@ -179,7 +185,7 @@
JsonListEntry<K> jsonlistentry = (JsonListEntry) iterator.next();
if (jsonlistentry.getKey() != null) {
- this.d.put(this.a(jsonlistentry.getKey()), jsonlistentry);
+ this.d.put(this.a((K) jsonlistentry.getKey()), (V) jsonlistentry); // CraftBukkit - fix decompile error
}
if (jsonlistentry.getKey() != null) {
- this.d.put(this.a(jsonlistentry.getKey()), jsonlistentry);
+ this.d.put(this.a(jsonlistentry.getKey()), (V) jsonlistentry); // CraftBukkit - fix decompile error
}
}
} catch (Throwable throwable1) {