From ee6aacbb5138e7ee1e509aed55ecfc6849938086 Mon Sep 17 00:00:00 2001 From: ksandr <65916671+ksandronline@users.noreply.github.com> Date: Mon, 12 Jul 2021 17:13:08 +0300 Subject: [PATCH 1/2] Fix Flaregun (#5) --- shooter_flaregun/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shooter_flaregun/init.lua b/shooter_flaregun/init.lua index 3e4ca87..0fa867f 100644 --- a/shooter_flaregun/init.lua +++ b/shooter_flaregun/init.lua @@ -85,7 +85,7 @@ minetest.register_entity("shooter_flaregun:flare_entity", { if minetest.get_node(pos).name == "air" and node.name ~= "default:water_source" and node.name ~= "default:water_flowing" then - minetest.place_node(pos, {name="shooter_flaregun:flare_light"}) + minetest.set_node(pos, {name="shooter_flaregun:flare_light"}) local meta = minetest.get_meta(pos) pos.y = pos.y - 0.1 local id = minetest.add_particlespawner({ From d4a450cd5bf91602d585202c88163315c8d976e0 Mon Sep 17 00:00:00 2001 From: ksandr <65916671+ksandronline@users.noreply.github.com> Date: Mon, 12 Jul 2021 17:24:30 +0300 Subject: [PATCH 2/2] Update minetest.setting_getbool to minetest.settings:get_bool (#6) --- shooter_crossbow/init.lua | 6 +++--- shooter_flaregun/init.lua | 2 +- shooter_grenade/init.lua | 2 +- shooter_hook/init.lua | 2 +- shooter_rocket/init.lua | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shooter_crossbow/init.lua b/shooter_crossbow/init.lua index 2e9dffd..f0b17df 100644 --- a/shooter_crossbow/init.lua +++ b/shooter_crossbow/init.lua @@ -217,7 +217,7 @@ for _, color in pairs(dye_basecolors) do groups = {not_in_creative_inventory=1}, on_use = function(itemstack, user) minetest.sound_play("shooter_click", {object=user}) - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then itemstack:add_wear(65535 / config.crossbow_uses) end itemstack = "shooter_crossbow:crossbow 1 "..itemstack:get_wear() @@ -265,7 +265,7 @@ minetest.register_tool("shooter_crossbow:crossbow", { local color = string.match(stack:get_name(), "shooter_crossbow:arrow_(%a+)") if color then minetest.sound_play("shooter_reload", {object=user}) - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then inv:remove_item("main", "shooter_crossbow:arrow_"..color.." 1") end return "shooter_crossbow:crossbow_loaded_"..color.." 1 "..itemstack:get_wear() @@ -273,7 +273,7 @@ minetest.register_tool("shooter_crossbow:crossbow", { for _, clr in pairs(dye_basecolors) do if inv:contains_item("main", "shooter_crossbow:arrow_"..clr) then minetest.sound_play("shooter_reload", {object=user}) - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then inv:remove_item("main", "shooter_crossbow:arrow_"..clr.." 1") end return "shooter_crossbow:crossbow_loaded_"..clr.." 1 "..itemstack:get_wear() diff --git a/shooter_flaregun/init.lua b/shooter_flaregun/init.lua index 0fa867f..b267398 100644 --- a/shooter_flaregun/init.lua +++ b/shooter_flaregun/init.lua @@ -135,7 +135,7 @@ minetest.register_tool("shooter_flaregun:flaregun", { minetest.sound_play("shooter_click", {object=user}) return itemstack end - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then inv:remove_item("main", "shooter:flare 1") itemstack:add_wear(65535 / 100) end diff --git a/shooter_grenade/init.lua b/shooter_grenade/init.lua index 6d5a817..d4979d7 100644 --- a/shooter_grenade/init.lua +++ b/shooter_grenade/init.lua @@ -63,7 +63,7 @@ minetest.register_tool("shooter_grenade:grenade", { description = "Grenade", inventory_image = "shooter_hand_grenade.png", on_use = function(itemstack, user, pointed_thing) - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then itemstack:clear() end if pointed_thing.type ~= "nothing" then diff --git a/shooter_hook/init.lua b/shooter_hook/init.lua index 3ed2662..7de07e7 100644 --- a/shooter_hook/init.lua +++ b/shooter_hook/init.lua @@ -22,7 +22,7 @@ local function throw_hook(itemstack, user, vel) local dir = user:get_look_dir() local yaw = user:get_look_horizontal() if pos and dir and yaw then - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then local before = itemstack:get_wear() itemstack:add_wear(65535 / 100) diff --git a/shooter_rocket/init.lua b/shooter_rocket/init.lua index bda2aa3..642c7c4 100644 --- a/shooter_rocket/init.lua +++ b/shooter_rocket/init.lua @@ -70,7 +70,7 @@ minetest.register_tool("shooter_rocket:rocket_gun_loaded", { inventory_image = "shooter_rocket_gun_loaded.png", groups = {not_in_creative_inventory=1}, on_use = function(itemstack, user, pointed_thing) - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then itemstack:add_wear(65535 / 50) end itemstack = "shooter_rocket:rocket_gun 1 "..itemstack:get_wear() @@ -109,7 +109,7 @@ minetest.register_tool("shooter_rocket:rocket_gun", { local inv = user:get_inventory() if inv:contains_item("main", "shooter_rocket:rocket") then minetest.sound_play("shooter_reload", {object=user}) - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then inv:remove_item("main", "shooter_rocket:rocket 1") end itemstack = "shooter_rocket:rocket_gun_loaded 1 "..itemstack:get_wear()