From bdd13beeff5045a34042439e39620b9ca550b214 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> Date: Tue, 27 Nov 2018 21:24:52 +0100 Subject: [PATCH] fix brass block->ingot recipe (clearing basic_materials' copper/silver recipe killed this one also) --- technic/tools/flashlight.lua | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua index 1be550e..252dc8c 100644 --- a/technic/tools/flashlight.lua +++ b/technic/tools/flashlight.lua @@ -13,6 +13,8 @@ description = S("Flashlight"), inventory_image = "technic_flashlight.png", stack_max = 1, + wear_represents = "technic_RE_charge", + on_refill = technic.refill_RE_charge, }) minetest.register_craft({ @@ -37,14 +39,13 @@ 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 - meta.charge = meta.charge - 2; - technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge) - hotbar[i]:set_metadata(minetest.serialize(meta)) - inv:set_stack("main", i, hotbar[i]) + if meta and meta.charge and meta.charge >= 2 then + if not technic.creative_mode then + meta.charge = meta.charge - 2; + technic.set_RE_wear(hotbar[i], meta.charge, flashlight_max_charge) + hotbar[i]:set_metadata(minetest.serialize(meta)) + inv:set_stack("main", i, hotbar[i]) + end return true end end @@ -80,7 +81,11 @@ local rounded_pos = vector.round(pos) rounded_pos.y = rounded_pos.y + 1 local old_pos = player_positions[player_name] - local player_moved = not vector.equals(old_pos, rounded_pos) + local player_moved = old_pos and not vector.equals(old_pos, rounded_pos) + if not old_pos then + old_pos = rounded_pos + player_moved = true + end -- Remove light, flashlight weared out or was removed from hotbar if was_wielding[player_name] and not flashlight_weared then @@ -106,7 +111,7 @@ minetest.register_node("technic:light", { drawtype = "glasslike", - tile_images = {"technic_light.png"}, + tiles = {"technic_light.png"}, paramtype = "light", groups = {not_in_creative_inventory=1}, drop = "", -- Gitblit v1.8.0