Mirrorlandia_minetest/teleport-request
1
0
Fork 0
mirror of https://github.com/minetest-mods/teleport-request.git synced 2024-07-04 14:55:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix chat (#47)

Browse Source 
* Fix indentation

* Remove additions

* Fix minetest.after calls

* Remove chat message code duplication; Allow setting of chat color

* No need to specify it's mod specific

* Apply suggestions from code review

Co-authored-by: David Leal <halfpacho@gmail.com>
This commit is contained in:
Oversword 2021-08-09 01:06:35 +01:00 committed by GitHub
parent 8e13e160fc
commit 7d21dd7123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 137 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.lua
View File

@ -22,6 +22,9 @@ USA
tp.timeout_delay = tonumber(minetest.settings:get("tp.timeout_delay")) or 60 tp.timeout_delay = tonumber(minetest.settings:get("tp.timeout_delay")) or 60
tp.version = "1.5" tp.version = "1.5"
-- Message color
tp.message_color = minetest.settings:get("tp.message_color") or "#FFFFFF"
-- Enable teleporting immediately to the specified player for those with "tp_admin" privilege. -- Enable teleporting immediately to the specified player for those with "tp_admin" privilege.
tp.enable_immediate_teleport = minetest.settings:get_bool("tp.enable_immediate_teleport") tp.enable_immediate_teleport = minetest.settings:get_bool("tp.enable_immediate_teleport")

434
functions.lua
View File

@ -30,6 +30,32 @@ local band = false
local muted_players = {} local muted_players = {}
local message_color = tp.message_color
local function color_string_to_number(color)
if string.sub(color,1,1) == '#' then
color = string.sub(color, 2)
end
if #color < 6 then
local r = string.sub(color,1,1)
local g = string.sub(color,2,2)
local b = string.sub(color,3,3)
color = r..r .. g..g .. b..b
elseif #color > 6 then
color = string.sub(color, 1, 6)
end
return tonumber(color, 16)
end
local message_color_number = color_string_to_number(message_color)
local function send_message(player, message)
minetest.chat_send_player(player, minetest.colorize(message_color, message))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), message, message_color_number)
end
end
local map_size = 30912 local map_size = 30912
function tp.can_teleport(to) function tp.can_teleport(to)
return to.x < map_size and to.x > -map_size and to.y < map_size and to.y > -map_size and to.z < map_size and to.z > -map_size return to.x < map_size and to.x > -map_size and to.y < map_size and to.y > -map_size and to.z < map_size and to.z > -map_size
@ -105,360 +131,263 @@ end
-- Mutes a player from sending you teleport requests -- Mutes a player from sending you teleport requests
function tp.tpr_mute(player, muted_player) function tp.tpr_mute(player, muted_player)
if muted_player == "" then if muted_player == "" then
minetest.chat_send_player(player, S("Usage: /tpr_mute <player>")) send_message(player, S("Usage: /tpr_mute <player>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("Usage: /tpr_mute <player>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(muted_player) then if not minetest.get_player_by_name(muted_player) then
minetest.chat_send_player(player, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online.")) send_message(player, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."), 0xFFFFFF)
end
return return
end end
if minetest.check_player_privs(muted_player, {tp_admin = true}) and not minetest.check_player_privs(player, {server = true}) then if minetest.check_player_privs(muted_player, {tp_admin = true}) and not minetest.check_player_privs(player, {server = true}) then
minetest.chat_send_player(player, S("tpr_mute: Failed to mute player @1: they have the tp_admin privilege.", muted_player)) send_message(player, S("tpr_mute: Failed to mute player @1: they have the tp_admin privilege.", muted_player))
return return
end end
if muted_players[player] == muted_player then if muted_players[player] == muted_player then
minetest.chat_send_player(player, S("tpr_mute: Player @1 is already muted.", muted_player)) send_message(player, S("tpr_mute: Player @1 is already muted.", muted_player))
return return
end end
muted_players[player] = muted_player muted_players[player] = muted_player
minetest.chat_send_player(player, S("tpr_mute: Player @1 successfully muted.", muted_player)) send_message(player, S("tpr_mute: Player @1 successfully muted.", muted_player))
end end
-- Unmutes a player from sending you teleport requests -- Unmutes a player from sending you teleport requests
function tp.tpr_unmute(player, muted_player) function tp.tpr_unmute(player, muted_player)
if muted_player == "" then if muted_player == "" then
minetest.chat_send_player(player, S("Usage: /tpr_unmute <player>")) send_message(player, S("Usage: /tpr_unmute <player>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("Usage: /tpr_unmute <player>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(muted_player) then if not minetest.get_player_by_name(muted_player) then
minetest.chat_send_player(player, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online.")) send_message(player, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."), 0xFFFFFF)
end
return return
end end
if muted_players[player] ~= muted_player then if muted_players[player] ~= muted_player then
minetest.chat_send_player(player, S("tpr_mute: Player @1 is not muted yet.", muted_player)) send_message(player, S("tpr_mute: Player @1 is not muted yet.", muted_player))
return return
end end
muted_players[player] = nil muted_players[player] = nil
minetest.chat_send_player(player, S("tpr_mute: Player @1 successfully unmuted.", muted_player)) send_message(player, S("tpr_mute: Player @1 successfully unmuted.", muted_player))
end end
-- Teleport Request System -- Teleport Request System
function tp.tpr_send(sender, receiver) function tp.tpr_send(sender, receiver)
-- Check if the sender is muted -- Check if the sender is muted
if muted_players[receiver] == sender and not minetest.check_player_privs(sender, {server = true}) then if muted_players[receiver] == sender and not minetest.check_player_privs(sender, {server = true}) then
minetest.chat_send_player(sender, S("Cannot send request to @1 (you have been muted).", receiver)) send_message(sender, S("Cannot send request to @1 (you have been muted).", receiver))
return return
end end
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tpr <Player name>")) send_message(sender, S("Usage: /tpr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage: /tpr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"), 0xFFFFFF)
end
return return
end end
-- Spam prevention -- Spam prevention
if spam_prevention[receiver] == sender and not minetest.check_player_privs(sender, {tp_admin = true}) then if spam_prevention[receiver] == sender and not minetest.check_player_privs(sender, {tp_admin = true}) then
minetest.chat_send_player(sender, S("Wait @1 seconds before you can send teleport requests to @2 again.", tp.timeout_delay, receiver)) send_message(sender, S("Wait @1 seconds before you can send teleport requests to @2 again.", tp.timeout_delay, receiver))
minetest.after(tp.timeout_delay, function(name) minetest.after(tp.timeout_delay, function(sender_name, receiver_name)
spam_prevention[name] = nil spam_prevention[receiver_name] = nil
if band == true then return end if band == true then return end
if spam_prevention[receiver] == nil then if spam_prevention[receiver_name] == nil then
minetest.chat_send_player(sender, S("You can now send teleport requests to @1.", receiver)) send_message(sender_name, S("You can now send teleport requests to @1.", receiver_name))
band = true band = true
end end
end, receiver) end, sender, receiver)
else else
-- Compatibility with beerchat -- Compatibility with beerchat
if minetest.get_modpath("beerchat") and not minetest.check_player_privs(sender, {tp_admin = true}) then if minetest.get_modpath("beerchat") and not minetest.check_player_privs(sender, {tp_admin = true}) then
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tpr <Player name>")) send_message(sender, S("Usage: /tpr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage: /tpr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"), 0xFFFFFF)
end
return return
end end
local player_receiver = minetest.get_player_by_name(receiver) local player_receiver = minetest.get_player_by_name(receiver)
if player_receiver:get_meta():get_string("beerchat:muted:" .. sender) == "true" then if player_receiver:get_meta():get_string("beerchat:muted:" .. sender) == "true" then
minetest.chat_send_player(sender, S("You are not allowed to send requests because you're muted.")) send_message(sender, S("You are not allowed to send requests because you're muted."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("You are not allowed to send requests because you're muted."), 0xFFFFFF)
end
return return
end end
end end
if minetest.check_player_privs(sender, {tp_admin = true}) and tp.enable_immediate_teleport then if minetest.check_player_privs(sender, {tp_admin = true}) and tp.enable_immediate_teleport then
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tpr <Player name>")) send_message(sender, S("Usage: /tpr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage: /tpr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"), 0xFFFFFF)
end
return return
end end
tp.tpr_list[receiver] = sender tp.tpr_list[receiver] = sender
tp.tpr_accept(receiver) tp.tpr_accept(receiver)
minetest.chat_send_player(sender, S("You are teleporting to @1.", receiver)) send_message(sender, S("You are teleporting to @1.", receiver))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("You are teleporting to @1.", receiver), 0xFFFFFF)
end
return return
end end
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tpr <Player name>")) send_message(sender, S("Usage: /tpr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage: /tpr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online"), 0xFFFFFF)
end
return return
end end
if minetest.get_modpath("gamehub") then -- Compatibility with gamehub (UNTESTED) if minetest.get_modpath("gamehub") then -- Compatibility with gamehub (UNTESTED)
if gamehub.players[receiver] then if gamehub.players[receiver] then
minetest.chat_send_player(sender, S("Teleport request denied, player is in the gamehub!")) send_message(sender, S("Teleport request denied, player is in the gamehub!"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Teleport request denied, player is in the gamehub!"), 0xFFFFFF)
end
return return
end end
end end
if minetest.get_modpath("chat2") then send_message(receiver, S("@1 is requesting to teleport to you. /tpy to accept.", sender))
chat2.send_message(minetest.get_player_by_name(receiver), S("@1 is requesting to teleport to you. /tpy to accept.", sender), 0xFFFFFF) send_message(sender, S("Teleport request sent! It will timeout in @1 seconds.", tp.timeout_delay))
chat2.send_message(minetest.get_player_by_name(sender), S("Teleport request sent! It will timeout in @1 seconds.", tp.timeout_delay), 0xFFFFFF)
end
minetest.chat_send_player(receiver, S("@1 is requesting to teleport to you. /tpy to accept.", sender))
minetest.chat_send_player(sender, S("Teleport request sent! It will timeout in @1 seconds.", tp.timeout_delay))
-- Write name values to list and clear old values. -- Write name values to list and clear old values.
tp.tpr_list[receiver] = sender tp.tpr_list[receiver] = sender
tp.tpn_list[sender] = receiver tp.tpn_list[sender] = receiver
-- Teleport timeout delay -- Teleport timeout delay
minetest.after(tp.timeout_delay, function(name) minetest.after(tp.timeout_delay, function(sender_name, receiver_name)
if tp.tpr_list[name] and tp.tpn_list[sender] then if tp.tpr_list[receiver_name] and tp.tpn_list[sender_name] then
tp.tpr_list[name] = nil tp.tpr_list[receiver_name] = nil
tp.tpn_list[sender] = nil tp.tpn_list[sender_name] = nil
minetest.chat_send_player(sender, S("Request timed-out.")) send_message(sender_name, S("Request timed-out."))
minetest.chat_send_player(receiver, S("Request timed-out.")) send_message(receiver_name, S("Request timed-out."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Request timed-out."), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(receiver), S("Request timed-out."), 0xFFFFFF)
end
return return
end end
end, receiver) end, sender, receiver)
end end
end end
function tp.tphr_send(sender, receiver) function tp.tphr_send(sender, receiver)
-- Check if the sender is muted -- Check if the sender is muted
if muted_players[receiver] == sender and not minetest.check_player_privs(sender, {server = true}) then if muted_players[receiver] == sender and not minetest.check_player_privs(sender, {server = true}) then
minetest.chat_send_player(sender, S("Cannot send request to @1 (you have been muted).", receiver)) send_message(sender, S("Cannot send request to @1 (you have been muted).", receiver))
return return
end end
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tphr <Player name>")) send_message(sender, S("Usage: /tphr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage. /tphr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online.")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."), 0xFFFFFF)
end
return return
end end
-- Spam prevention -- Spam prevention
if spam_prevention[receiver] == sender and not minetest.check_player_privs(sender, {tp_admin = true}) then if spam_prevention[receiver] == sender and not minetest.check_player_privs(sender, {tp_admin = true}) then
minetest.chat_send_player(sender, S("Wait @1 seconds before you can send teleport requests to @2 again.", tp.timeout_delay, receiver)) send_message(sender, S("Wait @1 seconds before you can send teleport requests to @2 again.", tp.timeout_delay, receiver))
minetest.after(tp.timeout_delay, function(name) minetest.after(tp.timeout_delay, function(sender_name, receiver_name)
spam_prevention[name] = nil spam_prevention[receiver_name] = nil
if band == true then return end if band == true then return end
if spam_prevention[receiver] == nil then if spam_prevention[receiver_name] == nil then
minetest.chat_send_player(sender, S("You can now send teleport requests to @1.", receiver)) send_message(sender_name, S("You can now send teleport requests to @1.", receiver_name))
band = true band = true
end end
end, receiver) end, sender, receiver)
else else
-- Compatibility with beerchat -- Compatibility with beerchat
if minetest.get_modpath("beerchat") and not minetest.check_player_privs(sender, {tp_admin = true}) then if minetest.get_modpath("beerchat") and not minetest.check_player_privs(sender, {tp_admin = true}) then
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tphr <Player name>")) send_message(sender, S("Usage: /tphr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage. /tphr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online.")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."), 0xFFFFFF)
end
return return
end end
local player_receiver = minetest.get_player_by_name(receiver) local player_receiver = minetest.get_player_by_name(receiver)
if player_receiver:get_meta():get_string("beerchat:muted:" .. sender) == "true" then if player_receiver:get_meta():get_string("beerchat:muted:" .. sender) == "true" then
minetest.chat_send_player(sender, S("You are not allowed to send requests because you're muted.")) send_message(sender, S("You are not allowed to send requests because you're muted."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("You are not allowed to send requests because you're muted."), 0xFFFFFF)
end
return return
end end
end end
if minetest.check_player_privs(sender, {tp_admin = true}) and tp.enable_immediate_teleport then if minetest.check_player_privs(sender, {tp_admin = true}) and tp.enable_immediate_teleport then
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tphr <Player name>")) send_message(sender, S("Usage: /tphr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage. /tphr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online.")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."), 0xFFFFFF)
end
return return
end end
tp.tphr_list[receiver] = sender tp.tphr_list[receiver] = sender
tp.tpr_accept(receiver) tp.tpr_accept(receiver)
minetest.chat_send_player(sender, S("@1 is teleporting to you.", receiver)) send_message(sender, S("@1 is teleporting to you.", receiver))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("@1 is teleporting to you.", receiver), 0xFFFFFF)
end
return return
end end
if receiver == "" then if receiver == "" then
minetest.chat_send_player(sender, S("Usage: /tphr <Player name>")) send_message(sender, S("Usage: /tphr <Player name>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage. /tphr <Player name>"), 0xFFFFFF)
end
return return
end end
if not minetest.get_player_by_name(receiver) then if not minetest.get_player_by_name(receiver) then
minetest.chat_send_player(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online.")) send_message(sender, S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("There is no player by that name. Keep in mind this is case-sensitive, and the player must be online."), 0xFFFFFF)
end
return return
end end
if minetest.get_modpath("gamehub") then -- Compatibility with gamehub (UNTESTED) if minetest.get_modpath("gamehub") then -- Compatibility with gamehub (UNTESTED)
if gamehub.players[receiver] then if gamehub.players[receiver] then
minetest.chat_send_player(sender, S("Teleport request denied, player is in the gamehub!")) send_message(sender, S("Teleport request denied, player is in the gamehub!"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Teleport request denied, player is in the gamehub!"), 0xFFFFFF)
end
return return
end end
end end
if minetest.get_modpath("chat2") then send_message(receiver, S("@1 is requesting that you teleport to them. /tpy to accept; /tpn to deny.", sender))
chat2.send_message(minetest.get_player_by_name(receiver), S("@1 is requesting that you teleport to them. /tpy to accept; /tpn to deny.", sender), 0xFFFFFF) send_message(sender, S("Teleport request sent! It will timeout in @1 seconds.", tp.timeout_delay))
chat2.send_message(minetest.get_player_by_name(sender), S("Teleport request sent! It will timeout in @1 seconds.", tp.timeout_delay), 0xFFFFFF)
end
minetest.chat_send_player(receiver, S("@1 is requesting that you teleport to them. /tpy to accept; /tpn to deny.", sender))
minetest.chat_send_player(sender, S("Teleport request sent! It will timeout in @1 seconds.", tp.timeout_delay))
-- Write name values to list and clear old values. -- Write name values to list and clear old values.
tp.tphr_list[receiver] = sender tp.tphr_list[receiver] = sender
tp.tpn_list[sender] = receiver tp.tpn_list[sender] = receiver
-- Teleport timeout delay -- Teleport timeout delay
minetest.after(tp.timeout_delay, function(name)
if tp.tphr_list[name] and tp.tpn_list[sender] then
tp.tphr_list[name] = nil
tp.tpn_list[sender] = nil
minetest.chat_send_player(sender, S("Request timed-out.")) minetest.after(tp.timeout_delay, function(sender_name, receiver_name)
minetest.chat_send_player(receiver, S("Request timed-out.")) if tp.tphr_list[receiver_name] and tp.tpn_list[sender_name] then
tp.tphr_list[receiver_name] = nil
tp.tpn_list[sender_name] = nil
if minetest.get_modpath("chat2") then send_message(sender_name, S("Request timed-out."))
chat2.send_message(minetest.get_player_by_name(sender), S("Request timed-out"), 0xFFFFFF) send_message(receiver_name, S("Request timed-out."))
chat2.send_message(minetest.get_player_by_name(receiver), S("Request timed-out"), 0xFFFFFF)
end
return return
end end
end, receiver) end, sender, receiver)
end end
end end
@ -473,20 +402,14 @@ function tp.tpc_send(sender, coordinates)
end end
if posx==nil or posy==nil or posz==nil or string.len(posx) > 6 or string.len(posy) > 6 or string.len(posz) > 6 then if posx==nil or posy==nil or posz==nil or string.len(posx) > 6 or string.len(posy) > 6 or string.len(posz) > 6 then
minetest.chat_send_player(sender, S("Usage: /tpc <x, y, z>")) send_message(sender, S("Usage: /tpc <x, y, z>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Usage: /tpc <x, y, z>"), 0xFFFFFF)
end
return nil return nil
end end
target_coords = {x=posx, y=posy, z=posz} target_coords = {x=posx, y=posy, z=posz}
if tp.can_teleport(target_coords) == false then if tp.can_teleport(target_coords) == false then
minetest.chat_send_player(sender, S("You cannot teleport to a location outside the map!")) send_message(sender, S("You cannot teleport to a location outside the map!"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("You cannot teleport to a location outside the map!"), 0xFFFFFF)
end
return nil return nil
end end
@ -495,10 +418,7 @@ function tp.tpc_send(sender, coordinates)
if minetest.check_player_privs(pname, {tp_admin = true}) then if minetest.check_player_privs(pname, {tp_admin = true}) then
tp.tpc_teleport_player(sender) tp.tpc_teleport_player(sender)
target_coords = nil target_coords = nil
minetest.chat_send_player(sender, S("Teleporting to: @1, @2, @3", posx, posy, posz)) send_message(sender, S("Teleporting to: @1, @2, @3", posx, posy, posz))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Teleporting to: @1, @2, @3", posx, posy, posz), 0xFFFFFF)
end
else else
if minetest.check_player_privs(pname, {tp_tpc = true}) then if minetest.check_player_privs(pname, {tp_tpc = true}) then
local protected = minetest.is_protected(target_coords, sender) local protected = minetest.is_protected(target_coords, sender)
@ -517,37 +437,24 @@ function tp.tpc_send(sender, coordinates)
tpc_target_coords[area.owner] = {x=posx, y=posy, z=posz} tpc_target_coords[area.owner] = {x=posx, y=posy, z=posz}
end end
minetest.chat_send_player(sender, S("Area request sent! Waiting for @1 to accept your request." .. send_message(sender, S("Area request sent! Waiting for @1 to accept your request." ..
" It will timeout in @2 seconds.", table.concat(areas:getNodeOwners(tpc_target_coords[area.owner]), S(", or ")), tp.timeout_delay)) " It will timeout in @2 seconds.", table.concat(areas:getNodeOwners(tpc_target_coords[area.owner]), S(", or ")), tp.timeout_delay))
minetest.chat_send_player(area.owner, S("@1 is requesting to teleport to a protected area" .. send_message(area.owner, S("@1 is requesting to teleport to a protected area" ..
" of yours @2.", sender, minetest.pos_to_string(tpc_target_coords[area.owner]))) " of yours @2.", sender, minetest.pos_to_string(tpc_target_coords[area.owner])))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Area request sent! Waiting for @1 to accept your request." ..
" It will timeout in @2 seconds.", table.concat(areas:getNodeOwners(tpc_target_coords[area.owner]), S(", or ")), tp.timeout_delay), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(area.owner), S("@1 is requesting to teleport to a protected area" ..
" of yours @2.", sender, minetest.pos_to_string(tpc_target_coords[area.owner])), 0xFFFFFF)
end
tp.tpc_list[area.owner] = sender tp.tpc_list[area.owner] = sender
tp.tpn_list[sender] = area.owner tp.tpn_list[sender] = area.owner
minetest.after(tp.timeout_delay, function(name) minetest.after(tp.timeout_delay, function(sender_name, receiver_name)
if tp.tpc_list[name] and tp.tpn_list[sender] then if tp.tpc_list[receiver_name] and tp.tpn_list[sender_name] then
tp.tpc_list[name] = nil tp.tpc_list[receiver_name] = nil
tp.tpn_list[sender] = nil tp.tpn_list[sender_name] = nil
minetest.chat_send_player(sender, S("Request timed-out.")) send_message(sender_name, S("Request timed-out."))
minetest.chat_send_player(area.owner, S("Request timed-out.")) send_message(receiver_name, S("Request timed-out."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Request timed-out."), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(area.owner), S("Request timed-out."), 0xFFFFFF)
end
return return
end end
end, area.owner) end, sender, area.owner)
else else
minetest.record_protection_violation(target_coords, sender) minetest.record_protection_violation(target_coords, sender)
end end
@ -560,15 +467,9 @@ function tp.tpc_send(sender, coordinates)
tp.tpc_teleport_player(sender) tp.tpc_teleport_player(sender)
target_coords = nil target_coords = nil
minetest.chat_send_player(sender, S("Teleporting to: @1, @2, @3", posx, posy, posz)) send_message(sender, S("Teleporting to: @1, @2, @3", posx, posy, posz))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Teleporting to: @1, @2, @3", posx, posy, posz), 0xFFFFFF)
end
else else
minetest.chat_send_player(sender, S("Error: You do not have permission to teleport to those coordinates.")) send_message(sender, S("Error: You do not have permission to teleport to those coordinates."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(sender), S("Error: You do not have permission to teleport to those coordinates."), 0xFFFFFF)
end
return return
end end
end end
@ -577,22 +478,15 @@ end
function tp.tpr_deny(name) function tp.tpr_deny(name)
if not tp.tpr_list[name] and not tp.tphr_list[name] if not tp.tpr_list[name] and not tp.tphr_list[name]
and not tp.tpc_list[name] and not tp.tpn_list[name] then and not tp.tpc_list[name] and not tp.tpn_list[name] then
minetest.chat_send_player(name, S("Usage: /tpn allows you to deny teleport/area requests sent to you by other players.")) send_message(name, S("Usage: /tpn allows you to deny teleport/area requests sent to you by other players."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name), S("Usage: /tpn allows you to deny teleport/area requests sent to you by other players."), 0xFFFFFF)
end
return return
end end
-- Area requests -- Area requests
if tp.tpc_list[name] then if tp.tpc_list[name] then
name2 = tp.tpc_list[name] name2 = tp.tpc_list[name]
minetest.chat_send_player(name2, S("Area request denied.")) send_message(name2, S("Area request denied."))
minetest.chat_send_player(name, S("You denied the request @1 sent you.", name2)) send_message(name, S("You denied the request @1 sent you.", name2))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name2), S("Area request denied."), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(name), S("You denied the request @1 sent you.", name2), 0xFFFFFF)
end
tp.tpc_list[name] = nil tp.tpc_list[name] = nil
-- Don't allow re-denying requests. -- Don't allow re-denying requests.
@ -603,12 +497,8 @@ function tp.tpr_deny(name)
-- Teleport requests -- Teleport requests
if tp.tpr_list[name] then if tp.tpr_list[name] then
name2 = tp.tpr_list[name] name2 = tp.tpr_list[name]
minetest.chat_send_player(name2, S("Teleport request denied.")) send_message(name2, S("Teleport request denied."))
minetest.chat_send_player(name, S("You denied the request @1 sent you.", name2)) send_message(name, S("You denied the request @1 sent you.", name2))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name2), S("Teleport request denied."), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(name), S("You denied the request @1 sent you.", name2), 0xFFFFFF)
end
tp.tpr_list[name] = nil tp.tpr_list[name] = nil
spam_prevention[name] = name2 spam_prevention[name] = name2
@ -618,12 +508,8 @@ function tp.tpr_deny(name)
elseif tp.tphr_list[name] then elseif tp.tphr_list[name] then
name2 = tp.tphr_list[name] name2 = tp.tphr_list[name]
minetest.chat_send_player(name2, S("Teleport request denied.")) send_message(name2, S("Teleport request denied."))
minetest.chat_send_player(name, S("You denied the request @1 sent you.", name2)) send_message(name, S("You denied the request @1 sent you.", name2))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name2), S("Teleport request denied."), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(name), S("You denied the request @1 sent you.", name2), 0xFFFFFF)
end
tp.tphr_list[name] = nil tp.tphr_list[name] = nil
spam_prevention[name] = name2 spam_prevention[name] = name2
@ -633,12 +519,8 @@ function tp.tpr_deny(name)
elseif tp.tpn_list[name] then elseif tp.tpn_list[name] then
name2 = tp.tpn_list[name] name2 = tp.tpn_list[name]
minetest.chat_send_player(name, S("You denied your request sent to @1.", name2)) send_message(name, S("You denied your request sent to @1.", name2))
minetest.chat_send_player(name2, S("@1 denied their request sent to you.", name)) send_message(name2, S("@1 denied their request sent to you.", name))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name), S("You denied your request sent to @1.", name2), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(name2), S("@1 denied their request sent to you.", name), 0xFFFFFF)
end
if tp.tpr_list[name2] then if tp.tpr_list[name2] then
tp.tpr_list[name2] = nil tp.tpr_list[name2] = nil
@ -660,10 +542,7 @@ function tp.tpr_accept(name)
-- Check to prevent constant teleporting -- Check to prevent constant teleporting
if not tp.tpr_list[name] and not tp.tphr_list[name] if not tp.tpr_list[name] and not tp.tphr_list[name]
and not tp.tpc_list[name] then and not tp.tpc_list[name] then
minetest.chat_send_player(name, S("Usage: /tpy allows you to accept teleport/area requests sent to you by other players.")) send_message(name, S("Usage: /tpy allows you to accept teleport/area requests sent to you by other players."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name), S("Usage: /tpy allows you to accept teleport/area requests sent to you by other players."), 0xFFFFFF)
end
return return
end end
@ -682,11 +561,8 @@ function tp.tpr_accept(name)
-- If source or target are not present, abort request. -- If source or target are not present, abort request.
if not source or not target then if not source or not target then
minetest.chat_send_player(name, S("@1 is not online right now.", name2)) send_message(name, S("@1 is not online right now.", name2))
tp.tpc_list[name] = nil tp.tpc_list[name] = nil
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name), S("@1 is not online right now.", name2), 0xFFFFFF)
end
return return
end end
@ -706,17 +582,11 @@ function tp.tpr_accept(name)
tp.tpn_list[name2] = nil tp.tpn_list[name2] = nil
end end
minetest.chat_send_player(name, chatmsg) send_message(name, chatmsg)
minetest.chat_send_player(name2, S("Request Accepted!")) send_message(name2, S("Request Accepted!"))
-- Avoid abusing with area requests -- Avoid abusing with area requests
target_coords = nil target_coords = nil
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name2), S("Request Accepted!"), 0xFFFFFF)
chat2.send_message(minetest.get_player_by_name(name), chatmsg, 0xFFFFFF)
return
end
end end
-- Teleport requests. -- Teleport requests.
@ -740,12 +610,9 @@ function tp.tpr_accept(name)
-- Could happen if either player disconnects (or timeout); if so just abort -- Could happen if either player disconnects (or timeout); if so just abort
if not source if not source
or not target then or not target then
minetest.chat_send_player(name, S("@1 is not online right now.", name2)) send_message(name, S("@1 is not online right now.", name2))
tp.tpr_list[name] = nil tp.tpr_list[name] = nil
tp.tphr_list[name] = nil tp.tphr_list[name] = nil
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name), S("@1 is not online right now.", name2), 0xFFFFFF)
end
return return
end end
@ -760,24 +627,14 @@ function tp.tpr_accept(name)
tp.tpn_list[name2] = nil tp.tpn_list[name2] = nil
end end
minetest.chat_send_player(name, chatmsg) send_message(name, chatmsg)
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name), chatmsg, 0xFFFFFF)
end
if minetest.check_player_privs(name2, {tp_admin = true}) == false then if minetest.check_player_privs(name2, {tp_admin = true}) == false then
minetest.chat_send_player(name2, S("Request Accepted!")) send_message(name2, S("Request Accepted!"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name2), S("Request Accepted!"), 0xFFFFFF)
end
else else
if tp.enable_immediate_teleport then return end if tp.enable_immediate_teleport then return end
minetest.chat_send_player(name2, S("Request Accepted!")) send_message(name2, S("Request Accepted!"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(name2), S("Request Accepted!"), 0xFFFFFF)
end
return return
end end
end end
@ -785,26 +642,18 @@ end
-- Teleport Jump - Relative Position Teleportation by number of nodes -- Teleport Jump - Relative Position Teleportation by number of nodes
function tp.tpj(player, param) function tp.tpj(player, param)
if param == "" then if param == "" then
minetest.chat_send_player(player, S("Usage: <x|y|z> <number>")) send_message(player, S("Usage: <x|y|z> <number>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("Usage: <x|y|z> <number>"), 0xFFFFFF)
end
return false return false
end end
local args = param:split(" ") -- look into this. Can it crash if the player does not have two parameters? local args = param:split(" ") -- look into this. Can it crash if the player does not have two parameters?
if #args < 2 then if #args < 2 then
minetest.chat_send_player(player, S("Usage: <x|y|z> <number>")) send_message(player, S("Usage: <x|y|z> <number>"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("Usage: <x|y|z> <number>"), 0xFFFFFF)
end
return false return false
end end
if not tonumber(args[2]) then if not tonumber(args[2]) then
if minetest.get_modpath("chat2") then send_message(player, S("Not a number!"))
chat2.send_message(minetest.get_player_by_name(player), S("Not a number!"), 0xFFFFFF)
end
return false, S("Not a number!") return false, S("Not a number!")
end end
@ -817,18 +666,12 @@ function tp.tpj(player, param)
elseif args[1] == "z" then elseif args[1] == "z" then
target_coords["z"] = target_coords["z"] + tonumber(args[2]) target_coords["z"] = target_coords["z"] + tonumber(args[2])
else else
minetest.chat_send_player(player, S("Not a valid axis. Valid options are X, Y or Z")) send_message(player, S("Not a valid axis. Valid options are X, Y or Z"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("Not a valid axis. Valid options are X, Y or Z"), 0xFFFFFF)
end
return return
end end
if tp.can_teleport(target_coords) == false then if tp.can_teleport(target_coords) == false then
minetest.chat_send_player(player, S("You cannot teleport to a location outside the map!")) send_message(player, S("You cannot teleport to a location outside the map!"))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("You cannot teleport to a location outside the map!"), 0xFFFFFF)
end
return return
end end
tp.tpc_teleport_player(player) tp.tpc_teleport_player(player)
@ -839,10 +682,7 @@ end
-- Evade -- Evade
function tp.tpe(player) function tp.tpe(player)
if minetest.get_modpath("chat2") then send_message(player, S("EVADE!"))
chat2.send_message(minetest.get_player_by_name(player), S("EVADE!"), 0xFFFFFF)
end
minetest.chat_send_player(player, S("EVADE!"))
local mindistance = 15 local mindistance = 15
local maxdistance = 50 local maxdistance = 50
local times = math.random(6,20) -- how many times to jump - minimum,maximum local times = math.random(6,20) -- how many times to jump - minimum,maximum
@ -875,20 +715,14 @@ if tp.enable_tpp_command then
local places = {} local places = {}
if not tp.available_places then tp.available_places = {} end if not tp.available_places then tp.available_places = {} end
for key, value in pairs(tp.available_places) do for key, value in pairs(tp.available_places) do
if minetest.get_modpath("chat2") then send_message(player, key)
chat2.send_message(minetest.get_player_by_name(player), key, 0xFFFFFF)
end
table.insert(places, key) table.insert(places, key)
end end
if #places == 0 then if #places == 0 then
if minetest.get_modpath("chat2") then send_message(player, S("There are no places yet."))
chat2.send_message(minetest.get_player_by_name(player), S("There are no places yet."), 0xFFFFFF)
end
return true, S("There are no places yet.") return true, S("There are no places yet.")
end end
if minetest.get_modpath("chat2") then send_message(player, S("Usage: /tpp <place>"))
chat2.send_message(minetest.get_player_by_name(player), S("Usage: /tpp <place>"), 0xFFFFFF)
end
table.insert(places, S("Usage: /tpp <place>")) table.insert(places, S("Usage: /tpp <place>"))
return true, table.concat(places, "\n") return true, table.concat(places, "\n")
@ -896,17 +730,11 @@ if tp.enable_tpp_command then
elseif tp.available_places[param] then elseif tp.available_places[param] then
local pos = {x = tp.available_places[param].x, y = tp.available_places[param].y, z = tp.available_places[param].z} local pos = {x = tp.available_places[param].x, y = tp.available_places[param].y, z = tp.available_places[param].z}
tp.tpp_teleport_player(player, pos) tp.tpp_teleport_player(player, pos)
minetest.chat_send_player(player, S("Teleporting to @1.", param)) send_message(player, S("Teleporting to @1.", param))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("Teleporting to @1.", param), 0xFFFFFF)
end
-- Check if the place exists. -- Check if the place exists.
elseif not tp.available_places[param] then elseif not tp.available_places[param] then
minetest.chat_send_player(player, S("There is no place by that name. Keep in mind this is case-sensitive.")) send_message(player, S("There is no place by that name. Keep in mind this is case-sensitive."))
if minetest.get_modpath("chat2") then
chat2.send_message(minetest.get_player_by_name(player), S("There is no place by that name. Keep in mind this is case-sensitive."), 0xFFFFFF)
end
return return
end end
end end

3
settingtypes.txt
View File

@ -1,6 +1,9 @@
# Timeout delay (default is 60) # Timeout delay (default is 60)
tp.timeout_delay (Timeout delay after a request is sent) int 60 tp.timeout_delay (Timeout delay after a request is sent) int 60
# Message color (default color is #FFFFFF)
tp.message_color (The color of the messages sent to players) string #FFFFFF
# Enables immediate teleport to players for those who have tp_admin privilege (enabled by default) # Enables immediate teleport to players for those who have tp_admin privilege (enabled by default)
tp.enable_immediate_teleport (Immediate teleport for those with tp_admin privilege) bool true tp.enable_immediate_teleport (Immediate teleport for those with tp_admin privilege) bool true