chore: update Minestom version & reader

hollow-cube · Feb 28, 2024 · a356d62 · a356d62
1 parent 6610395
commit a356d62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 metadata.format.version = "1.1"
 
 [versions]
-minestom = "7320437640"
+minestom = "aad7bdab0f"
 zstd = "1.5.5-3"
 fastutil = "8.5.12"
 

diff --git a/src/main/java/net/hollowcube/polar/PolarReader.java b/src/main/java/net/hollowcube/polar/PolarReader.java
@@ -4,11 +4,9 @@
 import net.minestom.server.network.NetworkBuffer;
 import net.minestom.server.utils.NamespaceID;
 import net.minestom.server.utils.chunk.ChunkUtils;
-import net.minestom.server.utils.validate.Check;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jglrxavpok.hephaistos.nbt.CompressedProcesser;
-import org.jglrxavpok.hephaistos.nbt.NBT;
 import org.jglrxavpok.hephaistos.nbt.NBTCompound;
 import org.jglrxavpok.hephaistos.nbt.NBTReader;
 
@@ -20,6 +18,10 @@
 @SuppressWarnings("UnstableApiUsage")
 public class PolarReader {
     private static final boolean FORCE_LEGACY_NBT = Boolean.getBoolean("polar.debug.force-legacy-nbt");
+    private static final int MAX_BLOCK_ENTITIES = Integer.MAX_VALUE;
+    private static final int MAX_CHUNKS = Integer.MAX_VALUE;
+    private static final int MAX_BLOCK_PALETTE_SIZE = 16*16*16;
+    private static final int MAX_BIOME_PALETTE_SIZE = 8*8*8;
 
     private PolarReader() {}
 
@@ -48,7 +50,7 @@ private PolarReader() {}
         if (version > PolarWorld.VERSION_WORLD_USERDATA)
             userData = buffer.read(BYTE_ARRAY);
 
-        var chunks = buffer.readCollection(b -> readChunk(version, b, maxSection - minSection + 1));
+        var chunks = buffer.readCollection(b -> readChunk(version, b, maxSection - minSection + 1), MAX_CHUNKS);
 
         return new PolarWorld(version, compression, minSection, maxSection, userData, chunks);
     }
@@ -62,7 +64,7 @@ private PolarReader() {}
             sections[i] = readSection(version, buffer);
         }
 
-        var blockEntities = buffer.readCollection(b -> readBlockEntity(version, b));
+        var blockEntities = buffer.readCollection(b -> readBlockEntity(version, b), MAX_BLOCK_ENTITIES);
 
         var heightmaps = new byte[PolarChunk.HEIGHTMAP_BYTE_SIZE][PolarChunk.HEIGHTMAPS.length];
         int heightmapMask = buffer.read(INT);
@@ -91,7 +93,7 @@ private PolarReader() {}
         // If section is empty exit immediately
         if (buffer.read(BOOLEAN)) return new PolarSection();
 
-        var blockPalette = buffer.readCollection(STRING).toArray(String[]::new);
+        var blockPalette = buffer.readCollection(STRING, MAX_BLOCK_PALETTE_SIZE).toArray(String[]::new);
         if (version <= PolarWorld.VERSION_SHORT_GRASS) {
             for (int i = 0; i < blockPalette.length; i++) {
                 String strippedID = blockPalette[i].split("\\[")[0];
@@ -108,7 +110,7 @@ private PolarReader() {}
             PaletteUtil.unpack(blockData, rawBlockData, bitsPerEntry);
         }
 
-        var biomePalette = buffer.readCollection(STRING).toArray(String[]::new);
+        var biomePalette = buffer.readCollection(STRING, MAX_BIOME_PALETTE_SIZE).toArray(String[]::new);
         int[] biomeData = null;
         if (biomePalette.length > 1) {
             biomeData = new int[PolarSection.BIOME_PALETTE_SIZE];