From f79ace6306307527d8be3be61fde6fad44bc8dd7 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 10 May 2021 10:00:13 +0200 Subject: [PATCH] Fix upgrading of enchanted items --- mods/ITEMS/mcl_smithing_table/init.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mods/ITEMS/mcl_smithing_table/init.lua b/mods/ITEMS/mcl_smithing_table/init.lua index 995cc04f8..5e0610f44 100644 --- a/mods/ITEMS/mcl_smithing_table/init.lua +++ b/mods/ITEMS/mcl_smithing_table/init.lua @@ -17,16 +17,18 @@ function mcl_smithing_table.upgrade_item(itemstack) local itemname = itemstack:get_name() - local upgrade_item = def._mcl_upgrade_item or itemname:gsub("diamond", "netherite") + local upgrade_item = def._mcl_upgrade_item + + if upgrade_item and mcl_enchanting.is_enchanted(itemname) then + upgrade_item = upgrade_item .. "_enchanted" + end + + upgrade_item = upgrade_item or itemname:gsub("diamond", "netherite") if upgrade_item == itemname then return end - if mcl_enchanting.is_enchanted(itemname) then - upgrade_item = upgrade_item .. "_enchanted" - end - itemstack:set_name(upgrade_item) -- Reload the ToolTips of the tool