twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-30 20:03:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Mappings Update

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-26 08:00:00 +11:00
parent 239b2828db
commit d7e312278d
120 changed files with 878 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
paper-server/nms-patches/JsonList.patch
View File

@@ -1,15 +1,6 @@
--- a/net/minecraft/server/JsonList.java
+++ b/net/minecraft/server/JsonList.java
@@ -56,7 +56,7 @@
this.c = file;
GsonBuilder gsonbuilder = (new GsonBuilder()).setPrettyPrinting();
- gsonbuilder.registerTypeHierarchyAdapter(JsonListEntry.class, new JsonList.JsonListEntrySerializer(null));
+ gsonbuilder.registerTypeHierarchyAdapter(JsonListEntry.class, new JsonList.JsonListEntrySerializer()); // CraftBukkit - decompile error
this.b = gsonbuilder.create();
}
@@ -86,7 +86,7 @@
@@ -85,7 +85,7 @@
@Nullable
public V get(K k0) {
this.h();
@@ -18,7 +9,7 @@
}
public void remove(K k0) {
@@ -108,6 +108,12 @@
@@ -107,6 +107,12 @@
return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
}
@@ -31,17 +22,35 @@
public boolean isEmpty() {
return this.d.size() < 1;
}
@@ -137,7 +143,7 @@
@@ -124,7 +130,7 @@
Iterator iterator = this.d.values().iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
- V v0 = (JsonListEntry) iterator.next();
+ V v0 = (V) iterator.next(); // CraftBukkit - decompile error
- this.d.remove(this.a(object));
+ this.d.remove(this.a((K) object)); // CraftBukkit - decompile error
if (v0.hasExpired()) {
list.add(v0.getKey());
@@ -134,7 +140,7 @@
iterator = list.iterator();
while (iterator.hasNext()) {
- K k0 = iterator.next();
+ K k0 = (K) iterator.next(); // CraftBukkit - decompile error
this.d.remove(this.a(k0));
}
@@ -142,7 +148,7 @@
}
@@ -180,7 +186,7 @@
JsonListEntry jsonlistentry = (JsonListEntry) iterator.next();
protected JsonListEntry<K> a(JsonObject jsonobject) {
- return new JsonListEntry<>((Object) null, jsonobject);
+ return new JsonListEntry<>((K) null, jsonobject); // CraftBukkit - decompile error
}
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);