Update to Minecraft 1.13-pre7

nms-patches/WorldNBTStorage.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/WorldNBTStorage.java
 +++ b/net/minecraft/server/WorldNBTStorage.java
-@@ -12,6 +12,11 @@
+@@ -14,6 +14,11 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -12,15 +12,15 @@
  public class WorldNBTStorage implements IDataManager, IPlayerFileData {
  
      private static final Logger b = LogManager.getLogger();
-@@ -22,6 +27,7 @@
+@@ -24,6 +29,7 @@
      private final String g;
      private final DefinedStructureManager h;
-     protected final DataConverterManager a;
+     protected final DataFixer a;
 +    private UUID uuid = null; // CraftBukkit
  
-     public WorldNBTStorage(File file, String s, boolean flag, DataConverterManager dataconvertermanager) {
-         this.a = dataconvertermanager;
-@@ -168,12 +174,38 @@
+     public WorldNBTStorage(File file, String s, @Nullable MinecraftServer minecraftserver, DataFixer datafixer) {
+         this.a = datafixer;
+@@ -170,6 +176,16 @@
          }
  
          if (nbttagcompound != null) {
@@ -34,9 +34,10 @@
 +                }
 +            }
 +            // CraftBukkit end
-             entityhuman.f(this.a.a((DataConverterType) DataConverterTypes.PLAYER, nbttagcompound));
-         }
+             int i = nbttagcompound.hasKeyOfType("DataVersion", 3) ? nbttagcompound.getInt("DataVersion") : -1;
  
+             entityhuman.f(GameProfileSerializer.a(this.a, DataFixTypes.PLAYER, nbttagcompound, i));
+@@ -178,6 +194,22 @@
          return nbttagcompound;
      }
  
@@ -59,9 +60,9 @@
      public IPlayerFileData getPlayerFileData() {
          return this;
      }
-@@ -203,4 +235,50 @@
-     public DefinedStructureManager h() {
-         return this.h;
+@@ -211,4 +243,50 @@
+     public DataFixer i() {
+         return this.a;
      }
 +
 +    // CraftBukkit start