From c64fe5080c996e8ea29b3e113043dd0aa962aaee Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 13 Dec 2018 11:00:00 +1100 Subject: Mappings Update --- nms-patches/JsonList.patch | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'nms-patches/JsonList.patch') 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 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 deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // CraftBukkit - fix decompile error - return this.a(jsonelement, type, jsondeserializationcontext); - } - -- cgit v1.2.3