twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 15:42:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/minecraft/nbt

Browse Source
This commit is contained in:
Owen1212055
2024-12-14 17:35:55 -05:00
parent f2f3b06179
commit 1dd7ab9203
7 changed files with 54 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
paper-server/patches/sources/net/minecraft/nbt/NbtUtils.java.patch Normal file
View File

@@ -0,0 +1,15 @@
--- a/net/minecraft/nbt/NbtUtils.java
+++ b/net/minecraft/nbt/NbtUtils.java
@@ -143,8 +_,10 @@
if (!tag.contains("Name", 8)) {
return Blocks.AIR.defaultBlockState();
} else {
- ResourceLocation resourceLocation = ResourceLocation.parse(tag.getString("Name"));
- Optional<? extends Holder<Block>> optional = blockGetter.get(ResourceKey.create(Registries.BLOCK, resourceLocation));
+ // Paper start - Validate resource location
+ ResourceLocation resourceLocation = ResourceLocation.tryParse(tag.getString("Name"));
+ Optional<? extends Holder<Block>> optional = resourceLocation != null ? blockGetter.get(ResourceKey.create(Registries.BLOCK, resourceLocation)) : Optional.empty();
+ // Paper end - Validate resource location
if (optional.isEmpty()) {
return Blocks.AIR.defaultBlockState();
} else {