Fixed #365

MohistMC · Jan 19, 2025 · fe6000b · fe6000b
1 parent 743d3fe
commit fe6000b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/modules/banner-api/src/main/java/org/bukkit/NamespacedKey.java b/modules/banner-api/src/main/java/org/bukkit/NamespacedKey.java
@@ -246,4 +246,21 @@ public static NamespacedKey fromString(@NotNull String string, @Nullable Plugin
     public static NamespacedKey fromString(@NotNull String key) {
         return fromString(key, null);
     }
+
+    // Paper start
+    @NotNull
+    public String namespace() {
+        return this.getNamespace();
+    }
+
+    @NotNull
+    public String value() {
+        return this.getKey();
+    }
+
+    @NotNull
+    public String asString() {
+        return this.namespace + ':' + this.key;
+    }
+    // Paper end
 }
diff --git a/...s/banner-server/src/main/java/org/bukkit/craftbukkit/v1_20_R1/util/CraftMagicNumbers.java b/...s/banner-server/src/main/java/org/bukkit/craftbukkit/v1_20_R1/util/CraftMagicNumbers.java
@@ -379,7 +379,7 @@ public String getItemTranslationKey(Material material) {
     @Override
     public String getTranslationKey(EntityType entityType) {
         Preconditions.checkArgument(entityType.getName() != null, "Invalid name of EntityType %s for translation key", entityType);
-        String mods = ServerAPI.entityTypeMap0.get(entityType).getDescriptionId();
+        String mods = ServerAPI.entityTypeMap0.containsKey(entityType) ? ServerAPI.entityTypeMap0.get(entityType).getDescriptionId() : entityType.getKey().asString();
         return net.minecraft.world.entity.EntityType.byString(entityType.getName()).map(net.minecraft.world.entity.EntityType::getDescriptionId).orElse(mods);
     }