diff --git a/worldeditadditions_commands/commands/selectors/pos1-2.lua b/worldeditadditions_commands/commands/selectors/pos1-2.lua index 79796e0..92f8754 100644 --- a/worldeditadditions_commands/commands/selectors/pos1-2.lua +++ b/worldeditadditions_commands/commands/selectors/pos1-2.lua @@ -1,64 +1,63 @@ -local weac = worldeditadditions_core -local Vector3 = weac.Vector3 - - -local function do_set(name, i) - local player = minetest.get_player_by_name(name) - local addend = Vector3.new(0,1,0) -- Add one on the y axis - weac.pos.set(name, i, Vector3.floor(player:get_pos()) + addend) -end - -local function do_set1(name, params_text) - do_set(name, 1) -end -local function do_set2(name, params_text) - do_set(name, 2) -end - -if minetest.registered_chatcommands["/pos1"] then - minetest.override_chatcommand("/pos1", { - params = "", - description = - "Sets pos1 to the current position of the calling player.", - func = do_set1 - }) -else - minetest.register_chatcommand("/pos1", { - params = "", - description = - "Sets pos1 to the current position of the calling player.", - privs = { worldedit = true }, - func = do_set1 - }) -end -if minetest.registered_chatcommands["/pos2"] then - minetest.override_chatcommand("/pos2", { - params = "", - description = "Sets pos2 to the current position of the calling player.", - func = do_set2 - }) -else - minetest.register_chatcommand("/pos2", { - params = "", - description = "Sets pos2 to the current position of the calling player.", - privs = { worldedit = true }, - func = do_set2 - }) -end - - -minetest.register_chatcommand("//pos", { - params = "", - description = "Sets position to the current position of the calling player.", - privs = { worldedit = true }, - func = function(name, params_text) - local i = tonumber(params_text) - if type(i) ~= "number" then - worldedit.player_notify(name, "Error: Invalid index number given.") - return - end - i = math.floor(i) - - do_set(name, i) - end +local weac = worldeditadditions_core +local Vector3 = weac.Vector3 + + +local function do_set(name, i) + local player = minetest.get_player_by_name(name) + weac.pos.set(name, i, Vector3.round(player:get_pos())) +end + +local function do_set1(name, params_text) + do_set(name, 1) +end +local function do_set2(name, params_text) + do_set(name, 2) +end + +if minetest.registered_chatcommands["/pos1"] then + minetest.override_chatcommand("/pos1", { + params = "", + description = + "Sets pos1 to the current position of the calling player.", + func = do_set1 + }) +else + minetest.register_chatcommand("/pos1", { + params = "", + description = + "Sets pos1 to the current position of the calling player.", + privs = { worldedit = true }, + func = do_set1 + }) +end +if minetest.registered_chatcommands["/pos2"] then + minetest.override_chatcommand("/pos2", { + params = "", + description = "Sets pos2 to the current position of the calling player.", + func = do_set2 + }) +else + minetest.register_chatcommand("/pos2", { + params = "", + description = "Sets pos2 to the current position of the calling player.", + privs = { worldedit = true }, + func = do_set2 + }) +end + + +minetest.register_chatcommand("//pos", { + params = "", + description = "Sets position to the current position of the calling player.", + privs = { worldedit = true }, + func = function(name, params_text) + local i = tonumber(params_text) + if type(i) ~= "number" then + worldedit.player_notify(name, "Error: Invalid index number given.") + return + end + i = math.floor(i) + + do_set(name, i) + end }) \ No newline at end of file