Replace getpos() with get_pos()

This commit is contained in:
Wuzzy 2019-02-01 06:33:07 +01:00
parent 1f1361d179
commit e789801662
58 changed files with 105 additions and 105 deletions

View file

@ -41,7 +41,7 @@ local function resolve_commands(commands, pos)
local nearest, farthest = nil, nil
local min_distance, max_distance = math.huge, -1
for index, player in pairs(players) do
local distance = vector.distance(pos, player:getpos())
local distance = vector.distance(pos, player:get_pos())
if distance < min_distance then
min_distance = distance
nearest = player:get_player_name()

View file

@ -304,7 +304,7 @@ function mesecon.mvps_move_objects(pos, dir, nodestack)
for _, obj in ipairs(objects_to_move) do
local entity = obj:get_luaentity()
if not entity or not mesecon.is_mvps_unmov(entity.name) then
local np = vector.add(obj:getpos(), dir)
local np = vector.add(obj:get_pos(), dir)
--move only if destination is not solid
local nn = minetest.get_node(np)

View file

@ -56,7 +56,7 @@ local function pp_on_timer(pos, elapsed)
end
elseif node.name == basename .. "_off" then
for k, obj in pairs(objs) do
local objpos = obj:getpos()
local objpos = obj:get_pos()
if obj_does_activate(obj, activated_by) then
if objpos.y > pos.y-1 and objpos.y < pos.y then
minetest.set_node(pos, {name = basename .. "_on"})

View file

@ -394,7 +394,7 @@ local entity_standing = {
-- This is a custom function which causes the banner to be dropped as item and destroys the entity.
_drop = function(self)
local pos = self.object:getpos()
local pos = self.object:get_pos()
pos.y = pos.y + 1
if not minetest.settings:get_bool("creative_mode") and self._base_color then

View file

@ -212,7 +212,7 @@ function mcl_beds.on_rightclick(pos, player)
end
end
local name = player:get_player_name()
local ppos = player:getpos()
local ppos = player:get_pos()
local tod = minetest.get_timeofday() * 24000
-- Values taken from Minecraft Wiki with offset of +6000

View file

@ -94,7 +94,7 @@ local spawn_item = function(self, pos)
end
ARROW_ENTITY.on_step = function(self, dtime)
local pos = self.object:getpos()
local pos = self.object:get_pos()
local dpos = table.copy(pos) -- digital pos
dpos = vector.round(dpos)
local node = minetest.get_node(dpos)
@ -166,7 +166,7 @@ ARROW_ENTITY.on_step = function(self, dtime)
end
if ok then
local dist = vector.distance(pos, obj:getpos())
local dist = vector.distance(pos, obj:get_pos())
if not closest_object or not closest_distance then
closest_object = obj
closest_distance = dist

View file

@ -82,7 +82,7 @@ local player_shoot_arrow = function(itemstack, player, power, damage)
local inv = player:get_inventory()
inv:set_stack("main", arrow_stack_id, arrow_stack)
end
local playerpos = player:getpos()
local playerpos = player:get_pos()
local dir = player:get_look_dir()
local yaw = player:get_look_horizontal()

View file

@ -146,7 +146,7 @@ function mcl_buckets.register_liquid(source_place, source_take, itemname, invent
if inv:room_for_item("main", new_bucket) then
inv:add_item("main", new_bucket)
else
minetest.add_item(user:getpos(), new_bucket)
minetest.add_item(user:get_pos(), new_bucket)
end
itemstack:take_item()
return itemstack
@ -247,7 +247,7 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
if inv:room_for_item("main", new_bucket) then
inv:add_item("main", new_bucket)
else
minetest.add_item(user:getpos(), new_bucket)
minetest.add_item(user:get_pos(), new_bucket)
end
if not minetest.settings:get_bool("creative_mode") then
itemstack:take_item()

View file

@ -96,7 +96,7 @@ minetest.register_globalstep(function(dtime)
local dim = mcl_worlds.pos_to_dimension(player:get_pos())
local frame
-- Clocks do not work in certain zones
if not mcl_worlds.clock_works(player:getpos()) then
if not mcl_worlds.clock_works(player:get_pos()) then
frame = random_frame
else
frame = now

View file

@ -28,7 +28,7 @@ minetest.register_globalstep(function(dtime)
return false
end
if has_compass(player) then
local pos = player:getpos()
local pos = player:get_pos()
local dim = mcl_worlds.pos_to_dimension(pos)
local compass_image
-- Compasses do not work in certain zones

View file

@ -121,7 +121,7 @@ function mcl_doors:register_trapdoor(name, def)
local p1 = pointed_thing.above
local param2 = 0
local placer_pos = placer:getpos()
local placer_pos = placer:get_pos()
if placer_pos then
param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos))
end

View file

@ -95,7 +95,7 @@ minetest.register_node("mcl_end:end_rod", {
local p1 = pointed_thing.above
local param2 = 0
local placer_pos = placer:getpos()
local placer_pos = placer:get_pos()
if placer_pos then
local dir = {
x = p1.x - placer_pos.x,

View file

@ -35,7 +35,7 @@ minetest.register_tool("mcl_fire:flint_and_steel", {
used = true
end
if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then
minetest.sound_play(idef.sound.breaks, {pos=user:getpos(), gain=0.5})
minetest.sound_play(idef.sound.breaks, {pos=user:get_pos(), gain=0.5})
end
if not minetest.settings:get_bool("creative_mode") and used == true then
itemstack:add_wear(65535/65) -- 65 uses

View file

@ -203,7 +203,7 @@ if flame_sound then
function mcl_fire.update_player_sound(player)
local player_name = player:get_player_name()
-- Search for flame nodes in radius around player
local ppos = player:getpos()
local ppos = player:get_pos()
local areamin = vector.subtract(ppos, radius)
local areamax = vector.add(ppos, radius)
local fpos, num = minetest.find_nodes_in_area(

View file

@ -297,7 +297,7 @@ minetest.register_abm({
-- Item must get sucked in when the item just TOUCHES the block above the hopper
-- This is the reason for the Y calculation.
-- Test: Items on farmland and slabs get sucked, but items on full blocks don't
local posob = object:getpos()
local posob = object:get_pos()
local posob_miny = posob.y + object:get_properties().collisionbox[2]
if math.abs(posob.x-pos.x) <= 0.5 and (posob_miny-pos.y < 1.5 and posob.y-pos.y >= 0.3) then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))

View file

@ -9,7 +9,7 @@ local make_filled_map = function(itemstack, placer, pointed_thing)
if inv:room_for_item("main", new_map) then
inv:add_item("main", new_map)
else
minetest.add_item(placer:getpos(), new_map)
minetest.add_item(placer:get_pos(), new_map)
end
return itemstack
end

View file

@ -365,7 +365,7 @@ end
doll_def.on_step = function(self, dtime)
-- Check if spawner is still present. If not, delete the entity
self.timer = self.timer + 0.01
local n = minetest.get_node_or_nil(self.object:getpos())
local n = minetest.get_node_or_nil(self.object:get_pos())
if self.timer > 1 then
if n and n.name and n.name ~= "mcl_mobspawners:spawner" then
self.object:remove()

View file

@ -223,7 +223,7 @@ minetest.register_abm({
if obj:is_player() or lua_entity then
local dim = mcl_worlds.pos_to_dimension(pos)
local objpos = obj:getpos()
local objpos = obj:get_pos()
if objpos == nil then
return
end

View file

@ -415,7 +415,7 @@ minetest.register_abm({
if portal_cooloff[obj] then
return
end
local objpos = obj:getpos()
local objpos = obj:get_pos()
if objpos == nil then
return
end

View file

@ -84,7 +84,7 @@ minetest.register_craftitem("mcl_potions:glass_bottle", {
if inv:room_for_item("main", water_bottle) then
inv:add_item("main", water_bottle)
else
minetest.add_item(placer:getpos(), water_bottle)
minetest.add_item(placer:get_pos(), water_bottle)
end
itemstack:take_item()
end

View file

@ -283,7 +283,7 @@ minetest.register_node("mcl_signs:wall_sign", {
local wdir = minetest.dir_to_wallmounted(dir)
local placer_pos = placer:getpos()
local placer_pos = placer:get_pos()
local fdir = minetest.dir_to_facedir(dir)
@ -443,7 +443,7 @@ minetest.register_entity("mcl_signs:text", {
self._signnodename = des._signnodename
end
end
local meta = minetest.get_meta(self.object:getpos())
local meta = minetest.get_meta(self.object:get_pos())
local text = meta:get_string("text")
self.object:set_properties({
textures={generate_texture(create_lines(text), self._signnodename)},

View file

@ -29,7 +29,7 @@ local function place_slab_normal(itemstack, placer, pointed_thing)
local p0 = pointed_thing.under
local p1 = pointed_thing.above
local placer_pos = placer:getpos()
local placer_pos = placer:get_pos()
local fpos = get_fpos(placer, pointed_thing)
@ -57,7 +57,7 @@ local function place_stair(itemstack, placer, pointed_thing)
local p1 = pointed_thing.above
local param2 = 0
local placer_pos = placer:getpos()
local placer_pos = placer:get_pos()
if placer_pos then
param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos))
end

View file

@ -114,7 +114,7 @@ local pearl_ENTITY={
-- Snowball on_step()--> called when snowball is moving.
local snowball_on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local pos = self.object:get_pos()
local node = minetest.get_node(pos)
local def = minetest.registered_nodes[node.name]
@ -131,7 +131,7 @@ end
-- Movement function of egg
local egg_on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local pos = self.object:get_pos()
local node = minetest.get_node(pos)
local def = minetest.registered_nodes[node.name]
@ -185,7 +185,7 @@ end
-- Movement function of ender pearl
local pearl_on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local pos = self.object:get_pos()
pos.y = math.floor(pos.y)
local node = minetest.get_node(pos)
local nn = node.name
@ -259,7 +259,7 @@ local pearl_on_step = function(self, dtime)
end
end
local oldpos = player:getpos()
local oldpos = player:get_pos()
-- Teleport and hurt player
player:setpos(telepos)
player:set_hp(player:get_hp() - 5)

View file

@ -20,7 +20,7 @@ local function do_tnt_physics(tnt_np,tntr)
for k, obj in pairs(objs) do
local ent = obj:get_luaentity()
local v = obj:getvelocity()
local p = obj:getpos()
local p = obj:get_pos()
if ent and ent.name == "mcl_tnt:tnt" then
obj:setvelocity({x=(p.x - tnt_np.x) + (tntr / 2) + v.x, y=(p.y - tnt_np.y) + tntr + v.y, z=(p.z - tnt_np.z) + (tntr / 2) + v.z})
else
@ -159,7 +159,7 @@ local function add_effects(pos, radius, drops)
end
function TNT:on_step(dtime)
local pos = self.object:getpos()
local pos = self.object:get_pos()
minetest.add_particle({
pos = {x=pos.x,y=pos.y+0.5,z=pos.z},
velocity = vector.new(math.random() * 0.2 - 0.1, 1.0 + math.random(), math.random() * 0.2 - 0.1),
@ -181,7 +181,7 @@ function TNT:on_step(dtime)
self.blinkstatus = not self.blinkstatus
end
if self.timer > 4 then
tnt.boom(self.object:getpos())
tnt.boom(self.object:get_pos())
self.object:remove()
end
end

View file

@ -245,7 +245,7 @@ armor.get_valid_player = function(self, player, msg)
minetest.log("error", "3d_armor: Player name is nil "..msg)
return
end
local pos = player:getpos()
local pos = player:get_pos()
local player_inv = player:get_inventory()
local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
if not pos then
@ -539,7 +539,7 @@ minetest.register_globalstep(function(dtime)
end
for _,player in pairs(minetest.get_connected_players()) do
local name = player:get_player_name()
local pos = player:getpos()
local pos = player:get_pos()
local hp = player:get_hp()
-- water breathing
if name and armor.def[name].water > 0 then

View file

@ -219,7 +219,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
pos = nil,
timer = 0,
on_activate = function(self)
local pos = self.object:getpos()
local pos = self.object:get_pos()
self.object:set_armor_groups({immortal=1})
if pos then
self.pos = vector.round(pos)
@ -233,7 +233,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
self.timer = self.timer + dtime
if self.timer > 1 then
self.timer = 0
local pos = self.object:getpos()
local pos = self.object:get_pos()
if pos then
if vector.equals(vector.round(pos), self.pos) then
return