From faa7c512af7430f0fd2cff5f723731c4dcccbfc3 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Thu, 24 Jun 2021 16:06:11 +0200
Subject: [PATCH] Support block nbt without handler

---
 .../minestom/server/instance/AnvilLoader.java | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/minestom/server/instance/AnvilLoader.java b/src/main/java/net/minestom/server/instance/AnvilLoader.java
index ba36bd144..77698026a 100644
--- a/src/main/java/net/minestom/server/instance/AnvilLoader.java
+++ b/src/main/java/net/minestom/server/instance/AnvilLoader.java
@@ -143,32 +143,30 @@ public class AnvilLoader implements IChunkLoader {
 
     private void loadTileEntities(Chunk loadedChunk, ChunkColumn fileChunk) {
         for (NBTCompound te : fileChunk.getTileEntities()) {
-            final String tileEntityID = te.getString("id");
-            if (tileEntityID == null) {
-                LOGGER.warn("Tile entity has failed to load due to invalid namespace");
-                continue;
-            }
             final var x = te.getInt("x");
             final var y = te.getInt("y");
             final var z = te.getInt("z");
             if (x == null || y == null || z == null) {
-                LOGGER.warn("Tile entity {} has failed to load due to invalid coordinate", tileEntityID);
+                LOGGER.warn("Tile entity has failed to load due to invalid coordinate");
                 continue;
             }
-            final var handler = BLOCK_MANAGER.getHandler(tileEntityID);
-            if (handler == null) {
-                LOGGER.warn("Block {} does not have any corresponding handler, world will load anyway.", tileEntityID);
-                continue;
+            Block block = loadedChunk.getBlock(x, y, z);
+
+            final String tileEntityID = te.getString("id");
+            if (tileEntityID != null) {
+                final var handler = BLOCK_MANAGER.getHandler(tileEntityID);
+                if (handler == null) {
+                    LOGGER.warn("Block {} does not have any corresponding handler, world will load anyway.", tileEntityID);
+                    continue;
+                }
+                block = block.withHandler(handler);
             }
             // Remove anvil tags
             te.removeTag("id")
                     .removeTag("x").removeTag("y").removeTag("z")
                     .removeTag("keepPacked");
             // Place block
-            final Block block = loadedChunk.getBlock(x, y, z)
-                    .withHandler(handler)
-                    .withNbt(te);
-            loadedChunk.setBlock(x, y, z, block);
+            loadedChunk.setBlock(x, y, z, block.withNbt(te));
         }
     }