Fixed parsing of NBT blocks failing due to missing ID

EngineHub · Dec 27, 2022 · c5d327f · c5d327f
1 parent de0e81b
commit c5d327f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WorldNativeAccess.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/wna/WorldNativeAccess.java
@@ -67,12 +67,14 @@ default <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position,
             if (block instanceof BaseBlock baseBlock) {
                 LinCompoundTag tag = baseBlock.getNbt();
                 if (tag != null) {
-                    tag = tag.toBuilder()
-                        .putString("id", baseBlock.getNbtId())
+                    LinCompoundTag.Builder tagBuilder = tag.toBuilder()
                         .putInt("x", position.getX())
                         .putInt("y", position.getY())
-                        .putInt("z", position.getZ())
-                        .build();
+                        .putInt("z", position.getZ());
+                    if (!baseBlock.getNbtId().isBlank()) {
+                        tagBuilder.putString("id", baseBlock.getNbtId());
+                    }
+                    tag = tagBuilder.build();
 
                     // update if TE changed as well
                     successful = updateTileEntity(pos, tag);

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
@@ -27,6 +27,7 @@
 import org.enginehub.linbus.format.snbt.LinStringIO;
 import org.enginehub.linbus.stream.exception.NbtWriteException;
 import org.enginehub.linbus.tree.LinCompoundTag;
+import org.enginehub.linbus.tree.LinStringTag;
 import org.enginehub.linbus.tree.LinTagType;
 
 import java.util.Map;
@@ -121,7 +122,8 @@ public String getNbtId() {
         if (nbtData == null) {
             return "";
         }
-        return nbtData.getValue().getTag("id", LinTagType.stringTag()).value();
+        LinStringTag idTag = nbtData.getValue().findTag("id", LinTagType.stringTag());
+        return idTag != null ? idTag.value() : "";
     }
 
     @Nullable