Fix search for operating flashlight
authorZefram <zefram@fysh.org>
Sun, 27 Apr 2014 17:45:22 +0000 (18:45 +0100)
committerShadowNinja <shadowninja@minetest.net>
Sun, 27 Apr 2014 18:43:31 +0000 (14:43 -0400)
Having a never-charged flashlight in the hotbar earlier than a charged
flashlight prevented the charged flashlight being found.

technic/tools/flashlight.lua

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