diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
index 424b361e6..0b2d8cdb9 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
@@ -61,6 +61,11 @@ public class PacketConsumers {
                 mappingsMOD[entry.getKey()] = entry.getValue();
             }
         }
+        for (int i = 0; i < mappingsMOD.length; i++) {
+            if (BlockStateUtils.isVanillaBlock(i)) {
+                mappingsMOD[i] = remap(i);
+            }
+        }
         BLOCK_LIST = new IntIdentityList(registrySize);
         BIOME_LIST = new IntIdentityList(RegistryUtils.currentBiomeRegistrySize());
     }
@@ -70,8 +75,7 @@ public class PacketConsumers {
     }
 
     public static int remapMOD(int stateId) {
-        int modStateId = mappingsMOD[stateId];
-        return BlockStateUtils.isVanillaBlock(modStateId) ? remap(modStateId) : modStateId;
+        return mappingsMOD[stateId];
     }
 
     public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> LEVEL_CHUNK_WITH_LIGHT = (user, event, packet) -> {