diff --git a/src/main/java/net/minestom/server/instance/AnvilLoader.java b/src/main/java/net/minestom/server/instance/AnvilLoader.java index 8af8e69e0..5ff1d1f0f 100644 --- a/src/main/java/net/minestom/server/instance/AnvilLoader.java +++ b/src/main/java/net/minestom/server/instance/AnvilLoader.java @@ -73,7 +73,7 @@ public class AnvilLoader implements IChunkLoader { } try { return loadMCA(instance, chunkX, chunkZ); - } catch (IOException | AnvilException e) { + } catch (Exception e) { EXCEPTION_MANAGER.handleException(e); } return CompletableFuture.completedFuture(null); diff --git a/src/main/java/net/minestom/server/instance/palette/PaletteImpl.java b/src/main/java/net/minestom/server/instance/palette/PaletteImpl.java index 60477e6e1..3c968ef0e 100644 --- a/src/main/java/net/minestom/server/instance/palette/PaletteImpl.java +++ b/src/main/java/net/minestom/server/instance/palette/PaletteImpl.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; import static net.minestom.server.instance.Chunk.CHUNK_SECTION_SIZE; -final class PaletteImpl implements Palette { +final class PaletteImpl implements Palette, Cloneable { // Magic values generated with "Integer.MAX_VALUE >> (31 - bitsPerIndex)" for bitsPerIndex between 1 and 16 private static final int[] MAGIC_MASKS = {0, 1, 3, 7, @@ -152,16 +152,10 @@ final class PaletteImpl implements Palette { // Palette if (bitsPerEntry < 9) { // Palette has to exist - writer.writeVarInt(lastPaletteIndex); - for (int i = 0; i < lastPaletteIndex; i++) { - writer.writeVarInt(paletteToValueList.getInt(i)); - } + writer.writeVarIntList(paletteToValueList, BinaryWriter::writeVarInt); } // Raw - writer.writeVarInt(values.length); - for (long datum : values) { - writer.writeLong(datum); - } + writer.writeLongArray(values); } private int fixBitsPerEntry(int bitsPerEntry) { diff --git a/src/main/java/net/minestom/server/network/packet/server/play/data/ChunkData.java b/src/main/java/net/minestom/server/network/packet/server/play/data/ChunkData.java index 12cd95e78..1f08dad6a 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/data/ChunkData.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/data/ChunkData.java @@ -19,7 +19,6 @@ import java.util.Objects; public record ChunkData(@NotNull NBTCompound heightmaps, byte @NotNull [] data, @NotNull Map blockEntities) implements Writeable { public ChunkData { - data = data.clone(); blockEntities = Map.copyOf(blockEntities); }