Fix another anvil weirdness and dupe glitch
parent
0a5b1e75d0
commit
88372778c9
|
@ -22,7 +22,7 @@ end
|
||||||
|
|
||||||
function mcl_enchanting.load_enchantments(itemstack, enchantments)
|
function mcl_enchanting.load_enchantments(itemstack, enchantments)
|
||||||
if not mcl_enchanting.is_book(itemstack:get_name()) then
|
if not mcl_enchanting.is_book(itemstack:get_name()) then
|
||||||
mcl_enchanting.unload_enchantments(itemstack)
|
mcl_enchanting.unload_enchantments(itemstack)
|
||||||
for enchantment, level in pairs(enchantments or mcl_enchanting.get_enchantments(itemstack)) do
|
for enchantment, level in pairs(enchantments or mcl_enchanting.get_enchantments(itemstack)) do
|
||||||
local enchantment_def = mcl_enchanting.enchantments[enchantment]
|
local enchantment_def = mcl_enchanting.enchantments[enchantment]
|
||||||
if enchantment_def.on_enchant then
|
if enchantment_def.on_enchant then
|
||||||
|
@ -159,7 +159,7 @@ function mcl_enchanting.combine(itemstack, combine_with)
|
||||||
local itemname = itemstack:get_name()
|
local itemname = itemstack:get_name()
|
||||||
local combine_name = combine_with:get_name()
|
local combine_name = combine_with:get_name()
|
||||||
local enchanted_itemname = mcl_enchanting.get_enchanted_itemstring(itemname)
|
local enchanted_itemname = mcl_enchanting.get_enchanted_itemstring(itemname)
|
||||||
if enchanted_itemname ~= mcl_enchanting.get_enchanted_itemstring(combine_name) and not mcl_enchanting.is_book(combine_name) then
|
if not enchanted_itemname or enchanted_itemname ~= mcl_enchanting.get_enchanted_itemstring(combine_name) and not mcl_enchanting.is_book(combine_name) then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
local enchantments = mcl_enchanting.get_enchantments(itemstack)
|
local enchantments = mcl_enchanting.get_enchantments(itemstack)
|
||||||
|
|
Loading…
Reference in New Issue