Merge branch 'master' of https://github.com/NukkitX/Nukkit into redstone

CloudburstMC · Apr 6, 2020 · a36d857 · a36d857
2 parents 6b047b4 + f247cae
commit a36d857
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/cn/nukkit/level/GlobalBlockPalette.java b/src/main/java/cn/nukkit/level/GlobalBlockPalette.java
@@ -72,8 +72,10 @@ public static int getOrCreateRuntimeId(int id, int meta) {
         int legacyId = id << 6 | meta;
         int runtimeId = legacyToRuntimeId.get(legacyId);
         if (runtimeId == -1) {
-            //runtimeId = registerMapping(runtimeIdAllocator.incrementAndGet(), legacyId);
-            throw new NoSuchElementException("Unmapped block registered id:" + id + " meta:" + meta);
+            runtimeId = legacyToRuntimeId.get(id << 6);
+            if (runtimeId == -1) {
+                throw new NoSuchElementException("Unmapped block registered id:" + id + " meta:" + meta);
+            }
         }
         return runtimeId;
     }