nalc/factions
1
0
Fork 0
forked from mtcontrib/factions
Code Issues Pull Requests Releases Wiki Activity

Fix: crash in diplomacy cmds

Browse Source
This commit is contained in:
Coder12a 2019-06-27 12:41:37 -05:00
parent c8f3528a43
commit 0008628566
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
chatcommands.lua
View File

@ -193,7 +193,7 @@ if factions_config.faction_user_priv == true then
def_global_privileges = {"faction_user"} def_global_privileges = {"faction_user"}
end end
factions.register_command ("name", { factions.register_command("name", {
faction_permissions = {"name"}, faction_permissions = {"name"},
format = {"string"}, format = {"string"},
description = "Change the faction's name.", description = "Change the faction's name.",
@ -642,7 +642,7 @@ if factions_config.faction_diplomacy == true then
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local target_name = args.strings[1] local target_name = args.strings[1]
local target_faction = factions.factions.get(target_name) local target_faction = factions.factions.get(target_name)
if target_faction then if target_faction then
if not target_faction.request_inbox[faction.name] then if not target_faction.request_inbox[faction.name] then
if faction.allies[target_name] then if faction.allies[target_name] then
@ -688,7 +688,7 @@ if factions_config.faction_diplomacy == true then
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local target_name = args.strings[1] local target_name = args.strings[1]
local target_faction = factions.factions.get(target_name) local target_faction = factions.factions.get(target_name)
if target_faction then if target_faction then
if not target_faction.request_inbox[faction.name] then if not target_faction.request_inbox[faction.name] then
if faction.allies[target_name] then if faction.allies[target_name] then
@ -734,6 +734,11 @@ if factions_config.faction_diplomacy == true then
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local target_name = args.strings[1] local target_name = args.strings[1]
local target_faction = factions.factions.get(target_name) local target_faction = factions.factions.get(target_name)
if not target_faction then
send_error(player, target_name .. " Is not a faction.")
return false
end
if faction.request_inbox[target_name] then if faction.request_inbox[target_name] then
if target_name == faction.name then if target_name == faction.name then
@ -770,6 +775,11 @@ if factions_config.faction_diplomacy == true then
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local target_name = args.strings[1] local target_name = args.strings[1]
local target_faction = factions.factions.get(target_name) local target_faction = factions.factions.get(target_name)
if not target_faction then
send_error(player, target_name .. " Is not a faction.")
return false
end
if faction.request_inbox[target_name] then if faction.request_inbox[target_name] then
if target_name == faction.name then if target_name == faction.name then
@ -797,6 +807,11 @@ if factions_config.faction_diplomacy == true then
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local target_name = args.strings[1] local target_name = args.strings[1]
local target_faction = factions.factions.get(target_name) local target_faction = factions.factions.get(target_name)
if not target_faction then
send_error(player, target_name .. " Is not a faction.")
return false
end
if not faction.enemies[target_name] then if not faction.enemies[target_name] then
if target_name == faction.name then if target_name == faction.name then
@ -832,6 +847,11 @@ if factions_config.faction_diplomacy == true then
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local target_name = args.strings[1] local target_name = args.strings[1]
local target_faction = factions.factions.get(target_name) local target_faction = factions.factions.get(target_name)
if not target_faction then
send_error(player, target_name .. " Is not a faction.")
return false
end
if faction.allies[target_name] then if faction.allies[target_name] then
if target_name == faction.name then if target_name == faction.name then
@ -1343,13 +1363,16 @@ factions.register_command("promote", {
local promoter_faction, promoter_facname = factions.get_player_faction(player) local promoter_faction, promoter_facname = factions.get_player_faction(player)
if player_faction and promoter_facname == facname then if player_faction and promoter_facname == facname and player ~= name then
factions.promote(faction.name, name, rank) factions.promote(faction.name, name, rank)
minetest.chat_send_player(player, "Promoted " .. name .. " to " .. rank .. "!") minetest.chat_send_player(player, "Promoted " .. name .. " to " .. rank .. "!")
return true return true
elseif not player_faction or promoter_facname ~= facname then elseif not player_faction or promoter_facname ~= facname then
send_error(player, name .. " is not in your faction") send_error(player, name .. " is not in your faction")
return false return false
elseif player == name then
send_error(player, "You can not promote yourself!")
return false
else else
send_error(player, name .. " cannot be promoted from your faction") send_error(player, name .. " cannot be promoted from your faction")
return false return false
@ -1651,20 +1674,21 @@ local premade_help_admin = ""
local a_z = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"} local a_z = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"}
for l, j in pairs(a_z) do minetest.register_on_mods_loaded(function()
for k, v in pairs(factions.commands) do for l, j in pairs(a_z) do
if k:sub(1, 1) == j then for k, v in pairs(factions.commands) do
if not v.dont_show_in_help then if k:sub(1, 1) == j then
if not table_Contains(v.global_privileges, "faction_admin") then if not v.dont_show_in_help then
premade_help = premade_help .. "\t/f " .. k .. v.description_arg .. " " .. v.description .. "\n" if not table_Contains(v.global_privileges, "faction_admin") then
premade_help = premade_help .. "\t/f " .. k .. v.description_arg .. " " .. v.description .. "\n"
end
premade_help_admin = premade_help_admin .. "\t/f " .. k .. v.description_arg .. " " .. v.description .. "\n"
end end
premade_help_admin = premade_help_admin .. "\t/f " .. k .. v.description_arg .. " " .. v.description .. "\n"
end end
end end
end end
end a_z = nil
end)
a_z = nil
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- name: show_help(playername, parameter) -- name: show_help(playername, parameter)