Fix chunk deserialization (#362)

Update Region.cs
ObsidianMC · May 30, 2023 · f7bf0c6 · f7bf0c6
1 parent d6171e4
commit f7bf0c6
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/Obsidian/WorldData/Region.cs b/Obsidian/WorldData/Region.cs
@@ -181,21 +181,13 @@ private static Chunk DeserializeChunk(NbtCompound chunkCompound)
 
             var section = chunk.Sections[secY + 4];
 
-            if (statesCompound.TryGetTag("data", out var dataArrayTag))
-            {
-                var data = dataArrayTag as NbtArray<long>;
-
-                section.BlockStateContainer.DataArray.storage = data!.GetArray();
-            }
-
             var chunkSecPalette = section.BlockStateContainer.Palette;
 
-            if (statesCompound.TryGetTag("palette", out var palleteArrayTag))
+            if (statesCompound!.TryGetTag("palette", out var palleteArrayTag))
             {
                 var blockStatesPalette = palleteArrayTag as NbtList;
-                foreach (NbtCompound entry in blockStatesPalette)
+                foreach (NbtCompound entry in blockStatesPalette!)
                 {
-                    var name = entry.GetString("Name");
                     var id = entry.GetInt("Id");
 
                     chunkSecPalette.GetOrAddId(BlocksRegistry.Get(id));//TODO PROCESS ADDED PROPERTIES TO GET CORRECT BLOCK STATE
@@ -204,6 +196,14 @@ private static Chunk DeserializeChunk(NbtCompound chunkCompound)
                 section.BlockStateContainer.GrowDataArray();
             }
 
+            //TODO find a way around this (We shouldn't be storing the states data array in nbt anyway.)
+            if (statesCompound.TryGetTag("data", out var dataArrayTag))
+            {
+                var data = dataArrayTag as NbtArray<long>;
+
+                section.BlockStateContainer.DataArray.storage = data!.GetArray();
+            }
+
             var biomesCompound = sectionCompound["biomes"] as NbtCompound;
             var biomesPalette = biomesCompound!["palette"] as NbtList;