your-land/yl_speak_up
22
0
Fork 0
forked from your-land-mirror/yl_speak_up
Code Pull Requests Activity

fixed bug with empty list in ipairs issue #8378

Browse Source
This commit is contained in:
Sokomine 2025-04-05 17:48:49 +02:00
parent 1b9df50376
commit 710c8e1928
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
exec_apply_effects.lua
View File

@ -780,7 +780,7 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r)
local npc_inv = minetest.get_inventory({type="detached", local npc_inv = minetest.get_inventory({type="detached",
name="yl_speak_up_npc_"..tostring(n_id)}) name="yl_speak_up_npc_"..tostring(n_id)})
-- put the drops into the inventory of the NPC -- put the drops into the inventory of the NPC
for i, d in ipairs(drop_list) do for i, d in ipairs(drop_list or {}) do
local rest = npc_inv:add_item("npc_main", ItemStack(d)) local rest = npc_inv:add_item("npc_main", ItemStack(d))
if(rest and not(rest:is_empty()) and rest:get_count()>0) then if(rest and not(rest:is_empty()) and rest:get_count()>0) then
yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id).. yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id)..
@ -867,7 +867,7 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r)
input.items = {} input.items = {}
-- multiple slots in the craft grid may contain the same item -- multiple slots in the craft grid may contain the same item
local sum_up = {} local sum_up = {}
for i, v in ipairs(r.r_craft_grid) do for i, v in ipairs(r.r_craft_grid or {}) do
if(v and v ~= "") then if(v and v ~= "") then
local stack = ItemStack(v) local stack = ItemStack(v)
-- store this for later crafting -- store this for later crafting
@ -913,7 +913,7 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r)
yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id).." ".. yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id).." "..
"Great: Crafting is possible!") "Great: Crafting is possible!")
-- actually consume the items required, return the ones in decremented_input -- actually consume the items required, return the ones in decremented_input
for i, v in ipairs(r.r_craft_grid) do for i, v in ipairs(r.r_craft_grid or {}) do
if(v and v ~= "") then if(v and v ~= "") then
npc_inv:remove_item("npc_main", ItemStack(v)) npc_inv:remove_item("npc_main", ItemStack(v))
end end
@ -925,7 +925,7 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r)
end end
npc_inv:add_item("npc_main", output.item) npc_inv:add_item("npc_main", output.item)
-- add the decremented_inputs -- add the decremented_inputs
for k,v in pairs(decremented_input.items) do for k,v in pairs(decremented_input.items or {}) do
if(k and not(v:is_empty())) then if(k and not(v:is_empty())) then
if(not(npc_inv:room_for_item("npc_main", v))) then if(not(npc_inv:room_for_item("npc_main", v))) then
yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id).." ".. yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id).." "..

4
exec_eval_preconditions.lua
View File

@ -74,7 +74,7 @@ yl_speak_up.eval_all_preconditions = function(player, prereq, o_id, other_option
-- during this call, so we can cache them -- during this call, so we can cache them
local properties = yl_speak_up.get_npc_properties(pname) local properties = yl_speak_up.get_npc_properties(pname)
for k, p in pairs(prereq) do for k, p in pairs(prereq or {}) do
yl_speak_up.debug_msg(player, n_id, o_id, "..checking ".. yl_speak_up.debug_msg(player, n_id, o_id, "..checking "..
tostring(p.p_id)..": "..yl_speak_up.show_precondition(p, pname)) tostring(p.p_id)..": "..yl_speak_up.show_precondition(p, pname))
if(not(yl_speak_up.eval_precondition(player, n_id, p, other_options_true_or_false, properties))) then if(not(yl_speak_up.eval_precondition(player, n_id, p, other_options_true_or_false, properties))) then
@ -465,7 +465,7 @@ yl_speak_up.eval_trade_list_preconditions = function(player)
for i, s_o_id in ipairs(sorted_o_list) do for i, s_o_id in ipairs(sorted_o_list) do
local prereq = options[s_o_id].o_prerequisites local prereq = options[s_o_id].o_prerequisites
local all_ok = true local all_ok = true
for k, p in pairs(prereq) do for k, p in pairs(prereq or {}) do
if(not(yl_speak_up.eval_precondition_npc_inv(p, inv, inv_name))) then if(not(yl_speak_up.eval_precondition_npc_inv(p, inv, inv_name))) then
all_ok = false all_ok = false
break break