Replace :[gs]etpos with :[gs]et_pos globally.

This commit is contained in:
Auke Kok 2019-10-07 09:08:08 -07:00
parent a7403d6600
commit 2a87ac818d
7 changed files with 15 additions and 15 deletions

View File

@ -1295,10 +1295,10 @@ minetest.register_on_respawnplayer(function(player)
local name = player:get_player_name() local name = player:get_player_name()
if boxes.players_in_boxes[name] then if boxes.players_in_boxes[name] then
local box = boxes.players_in_boxes[name] local box = boxes.players_in_boxes[name]
player:setpos(box.respawn) player:set_pos(box.respawn)
elseif boxes.players_editing_boxes[name] then elseif boxes.players_editing_boxes[name] then
local box = boxes.players_editing_boxes[name] local box = boxes.players_editing_boxes[name]
player:setpos(vector.add(box.entry, {x = 1, y = 0, z = 0})) player:set_pos(vector.add(box.entry, {x = 1, y = 0, z = 0}))
else else
players.return_to_lobby(player) players.return_to_lobby(player)
end end

View File

@ -72,7 +72,7 @@ local function register_teleport(name, def)
if on_teleport(pos, node, player) then if on_teleport(pos, node, player) then
local dir = player:get_look_dir() local dir = player:get_look_dir()
dir.y = 0 dir.y = 0
player:setpos(vector.subtract(pos, vector.normalize(dir))) player:set_pos(vector.subtract(pos, vector.normalize(dir)))
end end
end end

View File

@ -158,7 +158,7 @@ function emote.attach_to_node(player, pos, locked)
end) end)
attached[player] = object attached[player] = object
else else
player:setpos(vector.add(pos, vector_rotate_xz(emotedef.player_offset, facedir_to_look_horizontal(node.param2)))) player:set_pos(vector.add(pos, vector_rotate_xz(emotedef.player_offset, facedir_to_look_horizontal(node.param2))))
player:set_eye_offset(emotedef.eye_offset, {x = 0, y = 0, z = 0}) player:set_eye_offset(emotedef.eye_offset, {x = 0, y = 0, z = 0})
player:set_look_horizontal(facedir_to_look_horizontal(node.param2) + emotedef.look_horizontal_offset) player:set_look_horizontal(facedir_to_look_horizontal(node.param2) + emotedef.look_horizontal_offset)
player:set_animation(unpack(emotes[emotedef.emotestring])) player:set_animation(unpack(emotes[emotedef.emotestring]))

View File

@ -53,7 +53,7 @@ irc.bot_commands["whereis"].func = function(_, args)
local builder = bmeta.meta.builder local builder = bmeta.meta.builder
return true, "Player " .. args .. " is playing box " .. id .. " - \"" .. box_name .. "\" by " .. builder return true, "Player " .. args .. " is playing box " .. id .. " - \"" .. box_name .. "\" by " .. builder
else else
local pos = player:getpos() local pos = player:get_pos()
if pos.x < 1000 and pos.x > -1000 and if pos.x < 1000 and pos.x > -1000 and
pos.y < 200 and pos.y > -100 and pos.y < 200 and pos.y > -100 and
pos.z < 1000 and pos.z > -1000 then pos.z < 1000 and pos.z > -1000 then

View File

@ -57,10 +57,10 @@ function players.return_to_lobby(player, spawn)
local name = player:get_player_name() local name = player:get_player_name()
if boxes.teleport_to_tutorial_exit[name] then if boxes.teleport_to_tutorial_exit[name] then
boxes.teleport_to_tutorial_exit[name] = nil boxes.teleport_to_tutorial_exit[name] = nil
player:setpos(conf.tutorial.exit) player:set_pos(conf.tutorial.exit)
player:set_look_horizontal(3 * math.pi / 2) player:set_look_horizontal(3 * math.pi / 2)
elseif spawn then elseif spawn then
player:setpos({x = 0, y = 0, z = 0}) player:set_pos({x = 0, y = 0, z = 0})
player:set_look_horizontal(3 * math.pi / 2) player:set_look_horizontal(3 * math.pi / 2)
else else
-- put players around a central location -- put players around a central location
@ -75,7 +75,7 @@ function players.return_to_lobby(player, spawn)
z = math.sin(r), z = math.sin(r),
} }
player:setpos(vector.add(p, vector.multiply(n, d))) player:set_pos(vector.add(p, vector.multiply(n, d)))
player:set_look_horizontal((math.pi / 2) + r) player:set_look_horizontal((math.pi / 2) + r)
player:set_look_vertical(0) player:set_look_vertical(0)
end end
@ -108,7 +108,7 @@ end
local function player_health_adjust() local function player_health_adjust()
for _, player in pairs(minetest.get_connected_players()) do for _, player in pairs(minetest.get_connected_players()) do
local hp = player:get_hp() local hp = player:get_hp()
if player:getpos().y < -50 and hp > 0 then if player:get_pos().y < -50 and hp > 0 then
player:set_hp(hp - 100) player:set_hp(hp - 100)
player:set_velocity({x = 0, y = 0, z = 0}) player:set_velocity({x = 0, y = 0, z = 0})
player:set_acceleration({x = 0, y = 0, z = 0}) player:set_acceleration({x = 0, y = 0, z = 0})
@ -237,7 +237,7 @@ minetest.register_globalstep(function(dtime)
local time = os.time() local time = os.time()
for _, player in pairs(minetest.get_connected_players()) do for _, player in pairs(minetest.get_connected_players()) do
-- Check node the player is standing on and run callbacks -- Check node the player is standing on and run callbacks
local ppos = player:getpos() local ppos = player:get_pos()
local pos = vector.round(ppos) local pos = vector.round(ppos)
if ppos.y - pos.y <= 0.1 then if ppos.y - pos.y <= 0.1 then
local pos1 = vector.new(pos) local pos1 = vector.new(pos)

View File

@ -479,7 +479,7 @@ minetest.register_entity("signs:sign", {
textures = {}, textures = {},
collisionbox = {0, 0, 0, 0, 0, 0}, collisionbox = {0, 0, 0, 0, 0, 0},
on_activate = function(self) on_activate = function(self)
local pos = self.object:getpos() local pos = self.object:get_pos()
if vector.distance(pos, vector.round(pos)) > 0.25 then if vector.distance(pos, vector.round(pos)) > 0.25 then
self.object:remove() self.object:remove()
return return
@ -494,7 +494,7 @@ minetest.register_entity("signs:sign", {
else else
offset = vector.multiply(dir, 1/2 - 1/64) offset = vector.multiply(dir, 1/2 - 1/64)
end end
self.object:setpos(vector.add(pos, offset)) self.object:set_pos(vector.add(pos, offset))
self.object:set_properties({ self.object:set_properties({
textures = {textures}, textures = {textures},
visual_size = visual_size visual_size = visual_size

View File

@ -67,7 +67,7 @@ local function unwatching(name)
-- setpos seems to be very unreliable -- setpos seems to be very unreliable
-- this workaround helps though -- this workaround helps though
minetest.after(0.1, function() minetest.after(0.1, function()
watcher:setpos(pos) watcher:set_pos(pos)
end) end)
original_pos[watcher] = nil original_pos[watcher] = nil
end end
@ -87,7 +87,7 @@ minetest.register_chatcommand("watch", {
if watching[name] then if watching[name] then
unwatching(param) unwatching(param)
else else
original_pos[watcher] = watcher:getpos() original_pos[watcher] = watcher:get_pos()
end end
watching[name] = target watching[name] = target
@ -107,7 +107,7 @@ minetest.register_chatcommand("watch", {
minetest.set_player_privs(name, privs) minetest.set_player_privs(name, privs)
return true, S("Watching '@1' at @2.", param, return true, S("Watching '@1' at @2.", param,
minetest.pos_to_string(vector.round(target:getpos()))) minetest.pos_to_string(vector.round(target:get_pos())))
end end
return false, S("Invalid parameter ('@1'), param") return false, S("Invalid parameter ('@1'), param")