diff --git a/mods/capturetheflag/ctf_flag/flag_func.lua b/mods/capturetheflag/ctf_flag/flag_func.lua index d44f7c2..d9b772e 100644 --- a/mods/capturetheflag/ctf_flag/flag_func.lua +++ b/mods/capturetheflag/ctf_flag/flag_func.lua @@ -58,7 +58,7 @@ local function do_capture(attname, flag, returned) ctf_flag.delete(team, vector.new(flag)) ctf_flag.add(attacker.team, vector.new(flag)) else - minetest.env:set_node(pos,{name="air"}) + minetest.set_node(pos,{name="air"}) ctf_flag.delete(team,pos) end @@ -179,7 +179,7 @@ ctf_flag = { end end, on_construct = function(pos) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("infotext", "Unowned flag") end, after_place_node = function(pos, placer) @@ -187,7 +187,7 @@ ctf_flag = { return end - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if not meta then return @@ -200,12 +200,12 @@ ctf_flag = { -- add flag ctf_flag.add(team, pos) - if ctf.teams[team].spawn and minetest.env:get_node(ctf.teams[team].spawn).name == "ctf_flag:flag" then + if ctf.teams[team].spawn and minetest.get_node(ctf.teams[team].spawn).name == "ctf_flag:flag" then if not ctf.setting("flag.allow_multiple") then -- send message minetest.chat_send_all(team.."'s flag has been moved") - minetest.env:set_node(ctf.team(team).spawn,{name="air"}) - minetest.env:set_node({ + minetest.set_node(ctf.team(team).spawn,{name="air"}) + minetest.set_node({ x=ctf.team(team).spawn.x, y=ctf.team(team).spawn.y+1, z=ctf.team(team).spawn.z @@ -229,14 +229,14 @@ ctf_flag = { ctf.needs_save = true end - minetest.env:set_node(pos2, {name="ctf_flag:flag_top_"..ctf.team(team).data.color}) + minetest.set_node(pos2, {name="ctf_flag:flag_top_"..ctf.team(team).data.color}) - local meta2 = minetest.env:get_meta(pos2) + local meta2 = minetest.get_meta(pos2) meta2:set_string("infotext", team.."'s flag") else minetest.chat_send_player(placer:get_player_name(), "You are not part of a team!") - minetest.env:set_node(pos,{name="air"}) + minetest.set_node(pos,{name="air"}) end end } diff --git a/mods/capturetheflag/ctf_flag/gui.lua b/mods/capturetheflag/ctf_flag/gui.lua index bd0d6bb..54a9bb8 100644 --- a/mods/capturetheflag/ctf_flag/gui.lua +++ b/mods/capturetheflag/ctf_flag/gui.lua @@ -173,9 +173,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) ctf_flag.delete(team,pos) - minetest.env:set_node(pos,{name="air"}) + minetest.set_node(pos,{name="air"}) pos.y=pos.y+1 - minetest.env:set_node(pos,{name="air"}) + minetest.set_node(pos,{name="air"}) return true end diff --git a/mods/capturetheflag/ctf_flag/init.lua b/mods/capturetheflag/ctf_flag/init.lua index 335e8f1..d0e2149 100644 --- a/mods/capturetheflag/ctf_flag/init.lua +++ b/mods/capturetheflag/ctf_flag/init.lua @@ -264,7 +264,7 @@ minetest.register_abm({ chance = 1, action = function(pos) local top = {x=pos.x,y=pos.y+1,z=pos.z} - local flagmeta = minetest.env:get_meta(pos) + local flagmeta = minetest.get_meta(pos) if not flagmeta then return @@ -273,11 +273,11 @@ minetest.register_abm({ local flag_team_data = ctf_flag.get(pos) if not flag_team_data or not ctf.team(flag_team_data.team)then ctf.log("flag", "Flag does not exist! Deleting nodes. "..dump(pos)) - minetest.env:set_node(pos,{name="air"}) - minetest.env:set_node(top,{name="air"}) + minetest.set_node(pos,{name="air"}) + minetest.set_node(top,{name="air"}) return end - local topmeta = minetest.env:get_meta(top) + local topmeta = minetest.get_meta(top) local flag_name = flag_team_data.name if flag_name and flag_name ~= "" then flagmeta:set_string("infotext", flag_name.." - "..flag_team_data.team) @@ -291,12 +291,12 @@ minetest.register_abm({ end if flag_team_data.claimed then - minetest.env:set_node(top,{name="ctf_flag:flag_captured_top"}) + minetest.set_node(top,{name="ctf_flag:flag_captured_top"}) else - minetest.env:set_node(top,{name="ctf_flag:flag_top_"..ctf.team(flag_team_data.team).data.color}) + minetest.set_node(top,{name="ctf_flag:flag_top_"..ctf.team(flag_team_data.team).data.color}) end - topmeta = minetest.env:get_meta(top) + topmeta = minetest.get_meta(top) if flag_name and flag_name ~= "" then topmeta:set_string("infotext", flag_name.." - "..flag_team_data.team) else diff --git a/mods/capturetheflag/ctf_turret/init.lua b/mods/capturetheflag/ctf_turret/init.lua index 347544d..a1b6cdd 100644 --- a/mods/capturetheflag/ctf_turret/init.lua +++ b/mods/capturetheflag/ctf_turret/init.lua @@ -30,18 +30,18 @@ if ctf.setting("turrets") then }, groups = {cracky=3, stone=1}, on_construct = function(pos) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) meta:set_string("infotext", "Unowned turret") end, after_place_node = function(pos, placer) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if meta and ctf.players and ctf.player(placer:get_player_name()) and ctf.player(placer:get_player_name()).team then local team = ctf.player(placer:get_player_name()).team meta:set_string("team", team) meta:set_string("infotext", "Owned by "..team) else - minetest.env:set_node(pos,{name="air"}) + minetest.set_node(pos,{name="air"}) end end }) @@ -51,7 +51,7 @@ if ctf.setting("turrets") then interval = 0.25, chance = 4, action = function(pos, node) - local meta = minetest.env:get_meta(pos) + local meta = minetest.get_meta(pos) if not meta then return end @@ -72,7 +72,7 @@ if ctf.setting("turrets") then return end - local objects = minetest.env:get_objects_inside_radius(pos, 15) + local objects = minetest.get_objects_inside_radius(pos, 15) for _,obj in ipairs(objects) do if ( obj:is_player() and @@ -89,7 +89,7 @@ if ctf.setting("turrets") then } -- Create bullet entity - local bullet=minetest.env:add_entity({x=pos.x,y=pos.y+0.5,z=pos.z}, "ctf_turret:arrow_entity") + local bullet=minetest.add_entity({x=pos.x,y=pos.y+0.5,z=pos.z}, "ctf_turret:arrow_entity") -- Set velocity bullet:setvelocity({x=calc.x * ARROW_VELOCITY,y=calc.y * ARROW_VELOCITY,z=calc.z * ARROW_VELOCITY}) @@ -117,7 +117,7 @@ if ctf.setting("turrets") then end if self.timer > 0.2 then - local objs = minetest.env:get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1.5) + local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1.5) for k, obj in pairs(objs) do if obj:is_player() then obj:set_hp(obj:get_hp() - ARROW_DAMAGE) @@ -126,9 +126,9 @@ if ctf.setting("turrets") then end end - local node = minetest.env:get_node(pos) + local node = minetest.get_node(pos) if node.name ~= "air" and node.name ~= "ctf_turret:turret" then - --minetest.env:add_item(self.lastpos, "throwing:arrow") + --minetest.add_item(self.lastpos, "throwing:arrow") self.object:remove() end end