Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix CanPlaceOn/CanDestroy API issues

Browse Source
This commit is contained in:
Jake Potrebic 2022-06-07 18:13:05 -07:00
parent f8d0fdf127
commit f816947534
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
View File

@ -349,20 +349,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ private @Nullable Namespaced deserializeNamespaced(String raw) { + private @Nullable Namespaced deserializeNamespaced(String raw) {
+ boolean isTag = raw.length() > 0 && raw.codePointAt(0) == '#'; + boolean isTag = raw.length() > 0 && raw.codePointAt(0) == '#';
+ net.minecraft.commands.arguments.blocks.BlockStateParser blockParser = new net.minecraft.commands.arguments.blocks.BlockStateParser(new com.mojang.brigadier.StringReader(raw), true); + com.mojang.datafixers.util.Either<net.minecraft.commands.arguments.blocks.BlockStateParser.BlockResult, net.minecraft.commands.arguments.blocks.BlockStateParser.TagResult> result;
+ try { + try {
+ blockParser = blockParser.parse(false); + result = net.minecraft.commands.arguments.blocks.BlockStateParser.parseForTesting(net.minecraft.core.Registry.BLOCK, raw, false);
+ } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) { + } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
+ return null; + return null;
+ } + }
+ +
+ net.minecraft.resources.ResourceLocation key = null; + net.minecraft.resources.ResourceLocation key = null;
+ if (isTag) { + if (isTag && result.right().isPresent() && result.right().get().tag() instanceof net.minecraft.core.HolderSet.Named<net.minecraft.world.level.block.Block> namedSet) {
+ if (blockParser.getTag() != null) { + key = namedSet.key().location();
+ key = blockParser.getTag().location(); + } else if (result.left().isPresent()) {
+ } + key = net.minecraft.core.Registry.BLOCK.getKey(result.left().get().blockState().getBlock());
+ } else {
+ key = blockParser.id;
+ } + }
+ +
+ if (key == null) { + if (key == null) {