Fix search for operating flashlight

Having a never-charged flashlight in the hotbar earlier than a charged
flashlight prevented the charged flashlight being found.
This commit is contained in:
Zefram 2014-04-27 18:45:22 +01:00 committed by ShadowNinja
parent 5c59d97070
commit 70fb21ef36

@ -37,10 +37,7 @@ local function check_for_flashlight(player)
for i = 1, 8 do for i = 1, 8 do
if hotbar[i]:get_name() == "technic:flashlight" then if hotbar[i]:get_name() == "technic:flashlight" then
local meta = minetest.deserialize(hotbar[i]:get_metadata()) local meta = minetest.deserialize(hotbar[i]:get_metadata())
if not meta or not meta.charge then if meta and meta.charge and meta.charge >= 2 then
return false
end
if meta.charge >= 2 then
meta.charge = meta.charge - 2; meta.charge = meta.charge - 2;
technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge) technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge)
hotbar[i]:set_metadata(minetest.serialize(meta)) hotbar[i]:set_metadata(minetest.serialize(meta))