Fix crash when crafting callbacks return strings (minetest#12685)

Co-authored-by: Zughy <[email protected]>
EleutherAI · Aug 12, 2022 · 8bf1609 · 8bf1609
1 parent c8ee755
commit 8bf1609
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/builtin/game/register.lua b/builtin/game/register.lua
@@ -303,14 +303,16 @@ end
 
 function core.on_craft(itemstack, player, old_craft_list, craft_inv)
  for _, func in ipairs(core.registered_on_crafts) do
- itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack
+ -- cast to ItemStack since func() could return a string
+ itemstack = ItemStack(func(itemstack, player, old_craft_list, craft_inv) or itemstack)
  end
  return itemstack
 end
 
 function core.craft_predict(itemstack, player, old_craft_list, craft_inv)
  for _, func in ipairs(core.registered_craft_predicts) do
- itemstack = func(itemstack, player, old_craft_list, craft_inv) or itemstack
+ -- cast to ItemStack since func() could return a string
+ itemstack = ItemStack(func(itemstack, player, old_craft_list, craft_inv) or itemstack)
  end
  return itemstack
 end