Compare commits

..

2 Commits

Author SHA1 Message Date
02d41688ba Merge remote-tracking branch 'upstream/master' 2021-02-23 21:19:20 +01:00
ef553e8edf Fix crash 2020-06-27 16:37:31 +02:00
4 changed files with 7 additions and 7 deletions

0
depends.txt Normal file
View File

1
description.txt Normal file
View File

@ -0,0 +1 @@
Warp locations and warp stones (portal stones)

View File

@ -87,7 +87,7 @@ local warp = function(player, dest)
local pos = vector.new(warp) local pos = vector.new(warp)
pos.y = pos.y + 0.5 pos.y = pos.y + 0.5
player:set_pos(pos) player:setpos(pos)
player:set_look_horizontal(warp.yaw) player:set_look_horizontal(warp.yaw)
player:set_look_vertical(warp.pitch) player:set_look_vertical(warp.pitch)
minetest.chat_send_player(player:get_player_name(), "Warped to \"" .. dest .. "\"") minetest.chat_send_player(player:get_player_name(), "Warped to \"" .. dest .. "\"")
@ -103,8 +103,8 @@ local function do_warp_queue()
local t = minetest.get_us_time() local t = minetest.get_us_time()
for i = table.getn(warps_queue),1,-1 do for i = table.getn(warps_queue),1,-1 do
local e = warps_queue[i] local e = warps_queue[i]
if e.p:get_pos() then if e.p:getpos() then
if vector.equals(e.p:get_pos(), e.pos) then if vector.equals(e.p:getpos(), e.pos) then
if t > e.t then if t > e.t then
warp(e.p, e.w) warp(e.p, e.w)
table.remove(warps_queue, i) table.remove(warps_queue, i)
@ -127,10 +127,10 @@ end
local warp_queue_add = function(player, dest) local warp_queue_add = function(player, dest)
table.insert(warps_queue, { table.insert(warps_queue, {
t = minetest.get_us_time() + (warps_freeze * 1000000), t = minetest.get_us_time() + (warps_freeze * 1000000),
pos = player:get_pos(), pos = player:getpos(),
p = player, p = player,
w = dest, w = dest,
sh = minetest.sound_play("warps_woosh", { pos = player:get_pos() }) sh = minetest.sound_play("warps_woosh", { pos = player:getpos() })
}) })
minetest.chat_send_player(player:get_player_name(), "Don't move for " .. warps_freeze .. " seconds!") minetest.chat_send_player(player:get_player_name(), "Don't move for " .. warps_freeze .. " seconds!")
if queue_state == 0 then if queue_state == 0 then
@ -181,7 +181,7 @@ minetest.register_chatcommand("setwarp", {
end end
local player = minetest.get_player_by_name(name) local player = minetest.get_player_by_name(name)
local pos = vector.round(player:get_pos()) local pos = vector.round(player:getpos())
table.insert(warps, { table.insert(warps, {
name = param, name = param,
x = pos.x, x = pos.x,

View File

@ -1,2 +1 @@
name = warps name = warps
description = Warp locations and warp stones (portal stones)