mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-12 10:45:50 -07:00
Update to Minecraft 1.13-pre7
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
--- a/net/minecraft/server/JsonList.java
|
||||
+++ b/net/minecraft/server/JsonList.java
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
@Nullable
|
||||
public V get(K k0) {
|
||||
this.h();
|
||||
- return (JsonListEntry) this.d.get(this.a(k0));
|
||||
@@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
public void remove(K k0) {
|
||||
@@ -102,6 +102,12 @@
|
||||
@@ -108,6 +108,12 @@
|
||||
return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
|
||||
}
|
||||
|
||||
@@ -22,16 +22,25 @@
|
||||
public boolean isEmpty() {
|
||||
return this.d.size() < 1;
|
||||
}
|
||||
@@ -178,7 +184,7 @@
|
||||
JsonListEntry jsonlistentry = (JsonListEntry) iterator.next();
|
||||
@@ -137,7 +143,7 @@
|
||||
while (iterator.hasNext()) {
|
||||
Object object = 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
|
||||
- this.d.remove(this.a(object));
|
||||
+ this.d.remove(this.a((K) object)); // CraftBukkit - decompile error
|
||||
}
|
||||
|
||||
}
|
||||
@@ -180,7 +186,7 @@
|
||||
JsonListEntry 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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -207,11 +213,11 @@
|
||||
@@ -212,11 +218,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user