From 5119ba673ba78305cf0aef367ecb693a0321f4fe Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Sun, 5 Jan 2025 11:44:29 +0000 Subject: [PATCH] Existing nbt permission should allow default nbt --- .../extension/factory/parser/DefaultBlockParser.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java index 7f81f27ff0..3541de4ede 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/DefaultBlockParser.java @@ -607,6 +607,9 @@ private T validate(ParserContext context, T holder) } CompoundTag nbt = holder.getNbtData(); if (nbt != null) { + if (actor.hasPermission("worldedit.anyblock.nbt")) { + return holder; + } if (nbt.equals(holder.getBlockType().getDefaultState().getNbtData())) { if (!actor.hasPermission("worldedit.anyblock.default-nbt")) { throw new DisallowedUsageException(Caption.of( @@ -614,7 +617,7 @@ private T validate(ParserContext context, T holder) TextComponent.of("worldedit.anyblock.default-nbt") )); } - } else if (!actor.hasPermission("worldedit.anyblock.nbt")) { + } else { throw new DisallowedUsageException(Caption.of( "fawe.error.nbt.forbidden", TextComponent.of("worldedit.anyblock.nbt")