SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more compile fixes

Browse Source
This commit is contained in:
Jason Penilla
2022-12-07 21:24:59 -07:00
parent 6e1deb99aa
commit a0a9b9291a
11 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,7 +351,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ boolean isTag = raw.length() > 0 && raw.codePointAt(0) == '#';
+ com.mojang.datafixers.util.Either<net.minecraft.commands.arguments.blocks.BlockStateParser.BlockResult, net.minecraft.commands.arguments.blocks.BlockStateParser.TagResult> result;
+ try {
+ result = net.minecraft.commands.arguments.blocks.BlockStateParser.parseForTesting(net.minecraft.core.Registry.BLOCK, raw, false);
+ result = net.minecraft.commands.arguments.blocks.BlockStateParser.parseForTesting(net.minecraft.core.registries.BuiltInRegistries.BLOCK.asLookup(), raw, false);
+ } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
+ return null;
+ }
@@ -360,7 +360,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (isTag && result.right().isPresent() && result.right().get().tag() instanceof net.minecraft.core.HolderSet.Named<net.minecraft.world.level.block.Block> namedSet) {
+ key = namedSet.key().location();
+ } else if (result.left().isPresent()) {
+ key = net.minecraft.core.Registry.BLOCK.getKey(result.left().get().blockState().getBlock());
+ key = net.minecraft.core.registries.BuiltInRegistries.BLOCK.getKey(result.left().get().blockState().getBlock());
+ }
+
+ if (key == null) {