From 0e10e8360d6fa5aa6cbb86870b6244e8818d7dc8 Mon Sep 17 00:00:00 2001 From: coil <51716565+coil0@users.noreply.github.com> Date: Sun, 15 Mar 2020 17:27:36 +0100 Subject: [PATCH] Fix crash when placing cable plates (#534) --- technic/tools/flashlight.lua | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/technic/tools/flashlight.lua b/technic/tools/flashlight.lua index ff49c0a..a4ac608 100644 --- a/technic/tools/flashlight.lua +++ b/technic/tools/flashlight.lua @@ -8,7 +8,7 @@ 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", @@ -40,10 +40,12 @@ if hotbar[i]:get_name() == "technic:flashlight" then local meta = minetest.deserialize(hotbar[i]:get_metadata()) 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)) - inv:set_stack("main", i, hotbar[i]) + 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 @@ -53,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 @@ -75,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 @@ -105,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