Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-20 21:40:06 +01:00
Fix CraftNamespacedKey shenanigans (#6825)
Dieser Commit ist enthalten in:
Ursprung
70fe58d0a0
Commit
c20c9d39d3
19
patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch
Normale Datei
19
patches/server/0837-Fix-Bukkit-NamespacedKey-shenanigans.patch
Normale Datei
@ -0,0 +1,19 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nassim Jahnke <jahnke.nassim@gmail.com>
|
||||||
|
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) {
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren