Fix crash when vanilla dfu fails due to vanilla bug. See https://bugs…

….mojang.com/browse/MC-241172 as one example
OpenCubicChunks · Mar 28, 2022 · e7d3b31 · e7d3b31
1 parent b6d0e16
commit e7d3b31
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/storage/RegionCubeIO.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/storage/RegionCubeIO.java
@@ -380,14 +380,19 @@ private CompoundTag mergeOldNbt(CubePos pos, CompoundTag[] cubeTags) {
 
             int version = ChunkStorage.getVersion(cubeTags[i]);
 
-            cubeTags[i] = NbtUtils.update(this.dataFixer, DataFixTypes.CHUNK, cubeTags[i], version, 1493);
-            //if (nbt.getCompound("Level").getBoolean("hasLegacyStructureData")) {
-            //    if (this.legacyStructureHandler == null) {
-            //        this.legacyStructureHandler = LegacyStructureDataHandler.getLegacyStructureHandler(worldKey, (DimensionDataStorage)persistentStateManagerFactory.get());
-            //    }
-            //    nbt = this.legacyStructureHandler.updateFromLegacy(nbt);
-            //}
-            cubeTags[i] = NbtUtils.update(this.dataFixer, DataFixTypes.CHUNK, cubeTags[i], Math.max(1493, version));
+            try {
+                cubeTags[i] = NbtUtils.update(this.dataFixer, DataFixTypes.CHUNK, cubeTags[i], version, 1493);
+                //if (nbt.getCompound("Level").getBoolean("hasLegacyStructureData")) {
+                //    if (this.legacyStructureHandler == null) {
+                //        this.legacyStructureHandler = LegacyStructureDataHandler.getLegacyStructureHandler(worldKey, (DimensionDataStorage)persistentStateManagerFactory.get());
+                //    }
+                //    nbt = this.legacyStructureHandler.updateFromLegacy(nbt);
+                //}
+                cubeTags[i] = NbtUtils.update(this.dataFixer, DataFixTypes.CHUNK, cubeTags[i], Math.max(1493, version));
+            } catch (Exception e) {
+                System.err.printf("Vanilla DFU error on (%d, %d, %d)!\n", pos.getX(), pos.getY(), pos.getZ());
+                e.printStackTrace(System.err);
+            }
             if (cubeTags[i] == null) {
                 LOGGER.warn("Dropping incomplete cube at " + pos);
                 return null;