mtcontrib/factions
1
0
Fork 2
Code Issues Releases Wiki Activity

Fix: crashing

Browse Source
This commit is contained in:
Coder12a 2019-05-20 21:49:33 -05:00
parent b504eb6794
commit dbe7f4aabd
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chatcommands.lua
View File

@ -330,10 +330,10 @@ factions.register_command("list", {
infaction = false, infaction = false,
global_privileges = def_global_privileges, global_privileges = def_global_privileges,
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
local list = factions.factions.iterate() local list = factions.factions.to_array()
local tosend = "Existing factions:" local tosend = "Existing factions:"
for i,v in ipairs(list) do for i, v in ipairs(list) do
if i ~= #list then if i ~= #list then
tosend = tosend .. " " .. v .. "," tosend = tosend .. " " .. v .. ","
else else
@ -1525,7 +1525,7 @@ factions.register_command("obliterate", {
infaction = false, infaction = false,
global_privileges = {"faction_admin"}, global_privileges = {"faction_admin"},
on_success = function(player, faction, pos, parcelpos, args) on_success = function(player, faction, pos, parcelpos, args)
for i, facname in factions.factions.iterate() do for facname, i in factions.factions.iterate() do
factions.disband(facname, "obliterated") factions.disband(facname, "obliterated")
end end
return true return true

12
diplomacy_events.lua
View File

@ -1,13 +1,13 @@
function factions.start_diplomacy(name, faction) function factions.start_diplomacy(name, faction)
for l, i in factions.factions.iterate() do for l, i in factions.factions.iterate() do
local fac = factions.factions.get(i) local fac = factions.factions.get(l)
if i ~= name and not (faction.neutral[i] or faction.allies[i] or faction.enemies[i]) then if l ~= name and not (faction.neutral[l] or faction.allies[l] or faction.enemies[l]) then
if factions_config.faction_diplomacy == true then if factions_config.faction_diplomacy == true then
factions.new_neutral(name, i) factions.new_neutral(name, l)
factions.new_neutral(i, name) factions.new_neutral(l, name)
else else
factions.new_enemy(name, i) factions.new_enemy(name, l)
factions.new_enemy(i, name) factions.new_enemy(l, name)
end end
end end
end end

6
factions.lua
View File

@ -142,7 +142,7 @@ function factions.set_name(oldname, name)
local faction = factions.factions.get(oldname) local faction = factions.factions.get(oldname)
faction.name = name faction.name = name
for i, v in factions.factions.iterate() do for v, i in factions.factions.iterate() do
if v ~= oldname then if v ~= oldname then
local fac = factions.factions.get(v) local fac = factions.factions.get(v)
@ -301,7 +301,7 @@ function factions.disband(name, reason)
local faction = factions.factions.get(name) local faction = factions.factions.get(name)
if not faction.is_admin then if not faction.is_admin then
for i, v in factions.factions.iterate() do for v, i in factions.factions.iterate() do
local fac = factions.factions.get(v) local fac = factions.factions.get(v)
if fac ~= nil and fac.name ~= name then if fac ~= nil and fac.name ~= name then
if fac.enemies[name] then if fac.enemies[name] then
@ -496,7 +496,7 @@ end
function factions.faction_tick() function factions.faction_tick()
local now = os.time() local now = os.time()
for i, facname in factions.factions.iterate() do for facname, i in factions.factions.iterate() do
local faction = factions.factions.get(facname) local faction = factions.factions.get(facname)
if faction ~= nil then if faction ~= nil then