Update to Minecraft 1.10

1 files changed, 18 insertions, 9 deletions

diff --git a/nms-patches/NameReferencingFileConverter.patch b/nms-patches/NameReferencingFileConverter.patch
index 82806a36..b591ecbb 100644
--- a/nms-patches/NameReferencingFileConverter.patch
+++ b/nms-patches/NameReferencingFileConverter.patch
@@ -5,10 +5,10 @@
                  try {
                      gameprofilebanlist.load();
 -                } catch (FileNotFoundException filenotfoundexception) {
--                    NameReferencingFileConverter.e.warn("Could not load existing file " + gameprofilebanlist.c().getName(), filenotfoundexception);
+-                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { gameprofilebanlist.c().getName(), filenotfoundexception});
 +                // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace
 +                } catch (IOException filenotfoundexception) {
-+                    NameReferencingFileConverter.e.warn("Could not load existing file " + gameprofilebanlist.c().getName());
++                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { gameprofilebanlist.c().getName()});
                  }
              }
  
@@ -17,10 +17,10 @@
                  try {
                      ipbanlist.load();
 -                } catch (FileNotFoundException filenotfoundexception) {
--                    NameReferencingFileConverter.e.warn("Could not load existing file " + ipbanlist.c().getName(), filenotfoundexception);
+-                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { ipbanlist.c().getName(), filenotfoundexception});
 +                // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace
 +                } catch (IOException filenotfoundexception) {
-+                    NameReferencingFileConverter.e.warn("Could not load existing file " + ipbanlist.c().getName());
++                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { ipbanlist.c().getName()});
                  }
              }
  
@@ -29,10 +29,10 @@
                  try {
                      oplist.load();
 -                } catch (FileNotFoundException filenotfoundexception) {
--                    NameReferencingFileConverter.e.warn("Could not load existing file " + oplist.c().getName(), filenotfoundexception);
+-                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { oplist.c().getName(), filenotfoundexception});
 +                // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace
 +                } catch (IOException filenotfoundexception) {
-+                    NameReferencingFileConverter.e.warn("Could not load existing file " + oplist.c().getName());
++                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { oplist.c().getName()});
                  }
              }
  
@@ -41,10 +41,10 @@
                  try {
                      whitelist.load();
 -                } catch (FileNotFoundException filenotfoundexception) {
--                    NameReferencingFileConverter.e.warn("Could not load existing file " + whitelist.c().getName(), filenotfoundexception);
+-                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { whitelist.c().getName(), filenotfoundexception});
 +                // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace
 +                } catch (IOException filenotfoundexception) {
-+                    NameReferencingFileConverter.e.warn("Could not load existing file " + whitelist.c().getName());
++                    NameReferencingFileConverter.e.warn("Could not load existing file {}", new Object[] { whitelist.c().getName()});
                  }
              }
  
@@ -79,7 +79,16 @@
                          NameReferencingFileConverter.b(file);
                          if (!file1.renameTo(file3)) {
                              throw new NameReferencingFileConverter.FileConversionException("Could not convert file for " + s, null);
-@@ -467,7 +495,7 @@
+@@ -358,7 +386,7 @@
+ 
+                     private String a(GameProfile gameprofile) {
+                         String s = null;
+-                        String[] astring = astring1;
++                        // String[] astring = astring1; // CraftBukkit - decompile error
+                         int i = astring.length;
+ 
+                         for (int j = 0; j < i; ++j) {
+@@ -471,7 +499,7 @@
  
      private static File d(PropertyManager propertymanager) {
          String s = propertymanager.getString("level-name", "world");