Big improvement

Almost done, looking into some issues that needs fixing.
This commit is contained in:
Panquesito7 2019-08-02 19:31:03 -05:00 committed by GitHub
parent 5f424b9b1f
commit c6b8df9d6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -287,69 +287,24 @@ end
function tpr_accept(name, param)
-- Check to prevent constant teleporting.
if not tpr_list[name]
and not tphr_list[name] then
minetest.chat_send_player(name, S("Usage: /tpy allows you to accept teleport requests sent to you by other players"))
and not tphr_list[name]
or param == "" then
minetest.chat_send_player(name, S("Usage: /tpy <player>"))
return
end
if tpr_list[name] then
name2 = tpr_list[name]
source = minetest.get_player_by_name(name)
target = minetest.get_player_by_name(name2)
chatmsg = S("@1 is teleporting to you.", name2)
target = minetest.get_player_by_name(param)
chatmsg = S("@1 is teleporting to you.", param)
tpr_list[name] = nil
elseif tphr_list[name] then
name2 = tphr_list[name]
source = minetest.get_player_by_name(name2)
source = minetest.get_player_by_name(param)
target = minetest.get_player_by_name(name)
chatmsg = S("You are teleporting to @1.", name2)
chatmsg = S("You are teleporting to @1.", param)
tphr_list[name] = nil
-- Let the player choose which player to teleport to when there are multiple requests.
-- THIS IS AN UNTESTED FUNCTION. CHECK IT AT YOUR OWN RISK.
elseif tpr_list[name] > 1 then
name2 = tpr_list[name]
chatmsg = S("@1 is teleporting to you.", name2)
param = param:lower()
minetest.chat_send_player(name, S("Use /tpy <player> and choose a player to teleport to:"))
local tp = {}
for key, value in pairs(tpr_list) do
table.insert(tp, key)
end
if param == "" then
minetest.chat_send_player(name, S("Use /tpy <player> and choose a player to teleport to:"))
for key, value in pairs(tpr_list) do
table.insert(tp, key)
end
end
-- Teleport player to the specified player
if tpr_list[param] then
tpr_teleport_player(param)
minetest.chat_send_player(param, S("Request Accepted!"))
minetest.chat_send_player(name, chatmsg)
--tpr_list[name] = nil
end
elseif tphr_list[name] > 1 then
name2 = tphr_list[name]
chatmsg = S("You are teleporting to @1.", name2)
param = param:lower()
minetest.chat_send_player(name, S("Use /tpy <player> and choose a player to teleport to:"))
local tp = {}
for key, value in pairs(tphr_list) do
table.insert(tp, key)
end
if param == "" then
minetest.chat_send_player(name, S("Use /tpy <player> and choose a player to teleport to:"))
for key, value in pairs(tphr_list) do
table.insert(tp, key)
end
end
-- Teleport player to the specified player
if tphr_list[param] then
tpr_teleport_player(param)
minetest.chat_send_player(param, S("Request Accepted!"))
minetest.chat_send_player(name, chatmsg)
--tpr_list[name] = nil
end
else
return
end
@ -357,13 +312,12 @@ function tpr_accept(name, param)
-- Could happen if either player disconnects (or timeout); if so just abort
if not source
or not target then
minetest.chat_send_player(name, S("@1 just disconnected/left (by timeout).", name2))
minetest.chat_send_player(name, S("@1 doesn't exist, or just disconnected/left (by timeout).", param))
return
end
minetest.chat_send_player(name2, S("Request Accepted!"))
minetest.chat_send_player(name, chatmsg)
tpr_teleport_player()
minetest.chat_send_player(param, S("Request Accepted!"))
minetest.chat_send_player(name, chatmsg)
end
-- Teleport Jump - Relative Position Teleportation by number of nodes