minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix crash when kick vote target leaves before being kicked

Browse source 
Also fix the /unblock command which didn't work previously
This commit is contained in:
Thomas--S 2019-05-09 19:50:46 +02:00 committed by ANAND ︻气デ═一
parent ba432ea77c
commit 0eadaf9a96
1 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mods/other/vote/vote_kick.lua
View file

@ -37,6 +37,15 @@ minetest.register_chatcommand("vote_kick", {
minetest.log("warning", "Player '" .. name .. "' started a vote" .. minetest.log("warning", "Player '" .. name .. "' started a vote" ..
" to kick '" .. param .. "'") " to kick '" .. param .. "'")
if not vlist[param] then
vlist[param] = {
ip = minetest.get_player_ip(param),
locked = false
}
end
return vote.new_vote(name, { return vote.new_vote(name, {
description = "Kick " .. param, description = "Kick " .. param,
help = "/yes, /no or /abstain", help = "/yes, /no or /abstain",
@ -60,6 +69,9 @@ minetest.register_chatcommand("vote_kick", {
minetest.chat_send_all("Vote failed, " .. minetest.chat_send_all("Vote failed, " ..
#results.yes .. " to " .. #results.no .. ", " .. #results.yes .. " to " .. #results.no .. ", " ..
self.name .. " remains ingame.") self.name .. " remains ingame.")
if not minetest.get_player_by_name(self.name) then
vlist[self.name] = nil
end
end end
end, end,
@ -81,36 +93,15 @@ minetest.register_chatcommand("unblock", {
return false, "Please specify a player name to be unblocked!" return false, "Please specify a player name to be unblocked!"
end end
if not minetest.get_player_by_name(param) then if not vlist[param].locked then
return false, "Can't find player '" .. param .. "'"
end
if not vlist[name].locked then
return false, "Failed! " .. param .. " is not blocked" return false, "Failed! " .. param .. " is not blocked"
end end
vlist[name].locked = false vlist[param].locked = false
return true, param .. " has been successfully unblocked!" return true, param .. " has been successfully unblocked!"
end end
}) })
minetest.register_on_joinplayer(function(player)
local name = player:get_player_name()
if not vlist[name] then
vlist[name] = {
ip = minetest.get_player_ip(name),
locked = false
}
end
end)
minetest.register_on_leaveplayer(function(player)
local name = player:get_player_name()
if not vlist[name].locked then
vlist[name] = nil
end
end)
minetest.register_on_prejoinplayer(function(name, ip) minetest.register_on_prejoinplayer(function(name, ip)
if vlist[name] and vlist[name].locked then if vlist[name] and vlist[name].locked then
return "Please wait until the vote cool down period has elapsed before rejoining!" return "Please wait until the vote cool down period has elapsed before rejoining!"