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

Allow empty paths in namespaced keys (#12687)

Browse Source
This commit is contained in:
Lulu13022002
2025-06-21 07:56:45 +02:00
committed by GitHub
parent d61a51e81e
commit 29fc853271
4 changed files with 28 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
View File

@@ -39,7 +39,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
}
public static org.bukkit.loot.LootTable minecraftToBukkit(ResourceKey<LootTable> minecraft) {
return (minecraft == null || minecraft.location().getPath().isEmpty()) ? null : Bukkit.getLootTable(CraftLootTable.minecraftToBukkitKey(minecraft)); // Paper - fix some NamespacedKey parsing
return (minecraft == null) ? null : Bukkit.getLootTable(CraftLootTable.minecraftToBukkitKey(minecraft));
}
public static NamespacedKey minecraftToBukkitKey(ResourceKey<LootTable> minecraft) {

9
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
View File

@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.util;
import net.minecraft.resources.ResourceLocation;
import org.bukkit.NamespacedKey;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public final class CraftNamespacedKey {
@@ -11,14 +10,6 @@ public final class CraftNamespacedKey {
public CraftNamespacedKey() {
}
public static @Nullable NamespacedKey fromStringOrNull(@Nullable String string) {
if (string == null || string.isEmpty()) {
return null;
}
ResourceLocation minecraft = ResourceLocation.tryParse(string);
return (minecraft == null || minecraft.getPath().isEmpty()) ? null : CraftNamespacedKey.fromMinecraft(minecraft); // Paper - Bukkit's parser does not match Vanilla for empty paths
}
public static NamespacedKey fromString(String string) {
return CraftNamespacedKey.fromMinecraft(ResourceLocation.parse(string));
}