From 4a9ad94bf9560770c0efded0c8558c4747dc887f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio <hugo.locurcio@hugo.pro> Date: Sun, 26 Apr 2020 11:32:42 +0200 Subject: [PATCH] Fix chest formspec protection (#540) --- technic/tools/flashlight.lua | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua index 1be550e..a4ac608 100644 --- a/technic/tools/flashlight.lua +++ b/technic/tools/flashlight.lua @@ -8,11 +8,13 @@ technic.register_power_tool("technic:flashlight", flashlight_max_charge) minetest.register_alias("technic:light_off", "air") - + minetest.register_tool("technic:flashlight", { 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 @@ -54,7 +55,7 @@ minetest.register_on_joinplayer(function(player) local player_name = player:get_player_name() - local pos = player:getpos() + local pos = player:get_pos() local rounded_pos = vector.round(pos) rounded_pos.y = rounded_pos.y + 1 player_positions[player_name] = rounded_pos @@ -76,11 +77,15 @@ for i, player in pairs(minetest.get_connected_players()) do local player_name = player:get_player_name() local flashlight_weared = check_for_flashlight(player) - local pos = player:getpos() + local pos = player:get_pos() 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,9 +111,9 @@ minetest.register_node("technic:light", { drawtype = "glasslike", - tile_images = {"technic_light.png"}, + tiles = {"technic_light.png"}, paramtype = "light", - groups = {not_in_creative_inventory=1}, + groups = {not_in_creative_inventory = 1}, drop = "", walkable = false, buildable_to = true, -- Gitblit v1.8.0