From 867cd4ee395f1894bcde6cc5088b38a9580e126b Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 22 Apr 2020 21:46:14 +0200 Subject: [PATCH] Move heightmap code above block entity check --- .../packets/WorldPackets.java | 16 ++++++++-------- .../myles/ViaVersion/util/CompactArrayUtil.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java index 9d183c50d..c788bde27 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java @@ -55,6 +55,14 @@ public class WorldPackets { } } + CompoundTag heightMaps = chunk.getHeightMap(); + for (String key : heightMaps.keySet()) { + LongArrayTag heightMap = heightMaps.get(key); + int[] heightMapData = new int[256]; + CompactArrayUtil.iterateCompactArray(9, heightMapData.length, heightMap.getValue(), (i, v) -> heightMapData[i] = v); + heightMap.setValue(CompactArrayUtil.createCompactArrayWithPadding(9, heightMapData.length, i -> heightMapData[i])); + } + if (chunk.getBlockEntities() == null) return; for (CompoundTag blockEntity : chunk.getBlockEntities()) { StringTag idTag = blockEntity.get("id"); @@ -84,14 +92,6 @@ public class WorldPackets { blockEntity.put(skullOwnerTag); } } - - CompoundTag heightMaps = chunk.getHeightMap(); - for (String key : heightMaps.keySet()) { - LongArrayTag heightMap = heightMaps.get(key); - int[] heightMapData = new int[256]; - CompactArrayUtil.iterateCompactArray(9, heightMapData.length, heightMap.getValue(), (i, v) -> heightMapData[i] = v); - heightMap.setValue(CompactArrayUtil.createCompactArrayWithPadding(9, heightMapData.length, i -> heightMapData[i])); - } }); } }); diff --git a/common/src/main/java/us/myles/ViaVersion/util/CompactArrayUtil.java b/common/src/main/java/us/myles/ViaVersion/util/CompactArrayUtil.java index 5bd476bc4..2aa55e89b 100644 --- a/common/src/main/java/us/myles/ViaVersion/util/CompactArrayUtil.java +++ b/common/src/main/java/us/myles/ViaVersion/util/CompactArrayUtil.java @@ -4,7 +4,7 @@ import java.util.function.IntToLongFunction; public class CompactArrayUtil { //Oh no - private static final int[] MAGIC = new int[] { + private static final int[] MAGIC = { -1, -1, 0, Integer.MIN_VALUE, 0, 0, 1431655765, 1431655765, 0, Integer.MIN_VALUE, 0, 1, 858993459, 858993459, 0, 715827882, 715827882, 0, 613566756, 613566756, 0, Integer.MIN_VALUE, 0, 2, 477218588, 477218588, 0, 429496729, 429496729, 0,