diff options
| author | md_5 <git@md-5.net> | 2018-12-13 11:00:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-12-13 11:00:00 +1100 |
| commit | c64fe5080c996e8ea29b3e113043dd0aa962aaee (patch) | |
| tree | bdd0883450532288f4d4e1f4687bad7aca234019 /nms-patches/JsonList.patch | |
| parent | a3c2ec03148f9f38d4d27d045b1afee2fc6ff173 (diff) | |
| download | craftbukkit-c64fe5080c996e8ea29b3e113043dd0aa962aaee.tar craftbukkit-c64fe5080c996e8ea29b3e113043dd0aa962aaee.tar.gz craftbukkit-c64fe5080c996e8ea29b3e113043dd0aa962aaee.tar.lz craftbukkit-c64fe5080c996e8ea29b3e113043dd0aa962aaee.tar.xz craftbukkit-c64fe5080c996e8ea29b3e113043dd0aa962aaee.zip | |
Mappings Update
Diffstat (limited to 'nms-patches/JsonList.patch')
| -rw-r--r-- | nms-patches/JsonList.patch | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/nms-patches/JsonList.patch b/nms-patches/JsonList.patch index 0db0f198..f443fe22 100644 --- a/nms-patches/JsonList.patch +++ b/nms-patches/JsonList.patch @@ -1,5 +1,14 @@ --- 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 @@ @Nullable public V get(K k0) { @@ -40,17 +49,3 @@ } } } -@@ -212,11 +218,11 @@ - } - } - -- public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) { -+ public JsonElement serialize(JsonListEntry<K> object, Type type, JsonSerializationContext jsonserializationcontext) { // CraftBukkit - fix decompile error - return this.a((JsonListEntry) object, type, jsonserializationcontext); - } - -- public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { -+ public JsonListEntry<K> deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // CraftBukkit - fix decompile error - return this.a(jsonelement, type, jsondeserializationcontext); - } - |