Update to Minecraft 1.11

By: md_5 <git@md-5.net>
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions
--- a/paper-server/nms-patches/ChatModifier.patch
+++ b/paper-server/nms-patches/ChatModifier.patch
@@ -28,15 +28,16 @@
         return i;
     }
 
-@@ -440,11 +442,11 @@
-             }
+@@ -441,12 +443,12 @@
         }
 
+         @Nullable
 -        public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) {
 +        public JsonElement serialize(ChatModifier object, Type type, JsonSerializationContext jsonserializationcontext) { // CraftBukkit - fix decompile error
             return this.a((ChatModifier) object, type, jsonserializationcontext);
         }
 
+         @Nullable
 -        public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
 +        public ChatModifier deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // CraftBukkit - fix decompile error
             return this.a(jsonelement, type, jsondeserializationcontext);