Move heightmap code above block entity check

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]));
-                    }
                 });
             }
         });

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,