diff options
| author | Nassim Jahnke <[email protected]> | 2021-11-05 16:01:40 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-05 16:01:40 +0100 |
| commit | c20c9d39d3df82b1e12df74096da7691a48d03e2 (patch) | |
| tree | 3d720e0554427462ceae11179291eece93dc02a1 | |
| parent | 70fe58d0a0dd30cc2ca7fe914974b6d041952040 (diff) | |
| download | Paper-c20c9d39d3df82b1e12df74096da7691a48d03e2.tar.gz Paper-c20c9d39d3df82b1e12df74096da7691a48d03e2.zip | |
Fix CraftNamespacedKey shenanigans (#6825)
| -rw-r--r-- | patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch new file mode 100644 index 0000000000..dba489e79c --- /dev/null +++ b/patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke <[email protected]> +Date: Sun, 24 Oct 2021 15:49:35 +0200 +Subject: [PATCH] Fix Bukkit NamespacedKey shenanigans + + +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java +index 5f40d240b879e3989897b6e45725a8e5a6a7f194..5014192edb9616ce725fc1592832034789527b6f 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java +@@ -13,7 +13,7 @@ public final class CraftNamespacedKey { + return null; + } + ResourceLocation minecraft = ResourceLocation.tryParse(string); +- return (minecraft == null) ? null : CraftNamespacedKey.fromMinecraft(minecraft); ++ 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) { |