From be18bdee88604f029c830171ea5f0d56faab7767 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Sun, 17 Mar 2019 20:51:10 +0000 Subject: [PATCH] Fix getDefaultCreatorModId for enchanted books (#5534) --- .../java/net/minecraftforge/common/ForgeHooks.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 0555c2a27a..e7621b00c0 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -1009,14 +1009,10 @@ public class ForgeHooks if (enchantmentsNbt.size() == 1) { NBTTagCompound nbttagcompound = enchantmentsNbt.getCompound(0); - Enchantment enchantment = Enchantment.getEnchantmentByID(nbttagcompound.getShort("id")); - if (enchantment != null) + ResourceLocation resourceLocation = ResourceLocation.makeResourceLocation(nbttagcompound.getString("id")); + if (resourceLocation != null && ForgeRegistries.ENCHANTMENTS.containsKey(resourceLocation)) { - ResourceLocation resourceLocation = ForgeRegistries.ENCHANTMENTS.getKey(enchantment); - if (resourceLocation != null) - { - return resourceLocation.getNamespace(); - } + return resourceLocation.getNamespace(); } } }