Modpol/modpol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added failsafes to interactions against 'deleted' processes

Browse Source
This commit is contained in:
Nathan Schneider
2022-01-06 09:58:15 -07:00
parent bdf4d86593
commit 65bb1aa532
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modpol_core/interactions/interactions.lua
View File

@@ -175,6 +175,7 @@ function modpol.interactions.org_dashboard(user, org_string)
local processes = {} local processes = {}
print("All processes: (* indicates pending)") print("All processes: (* indicates pending)")
for i,v in ipairs(org.processes) do for i,v in ipairs(org.processes) do
if v ~= "deleted" then
local active = '' local active = ''
if org.pending[user] then if org.pending[user] then
if org.pending[user][v.id] then if org.pending[user][v.id] then
@@ -183,6 +184,7 @@ function modpol.interactions.org_dashboard(user, org_string)
end end
print("["..v.id.."] "..v.slug..active) print("["..v.id.."] "..v.slug..active)
end end
end
print() print()
print("Interact with which one (use [id] number)?") print("Interact with which one (use [id] number)?")
local to_interact = io.read() local to_interact = io.read()

2
modpol_minetest/overrides/interactions.lua
View File

@@ -161,12 +161,14 @@ function modpol.interactions.org_dashboard(user, org_string)
local num_pending = 0 local num_pending = 0
if org.pending[user] then if org.pending[user] then
for k,v in pairs(org.pending[user]) do for k,v in pairs(org.pending[user]) do
if org.processes[k] ~= "deleted" then
local pending_string = org.processes[k].name local pending_string = org.processes[k].name
.." ["..k.."]" .." ["..k.."]"
table.insert(pending, pending_string) table.insert(pending, pending_string)
num_pending = num_pending + 1 num_pending = num_pending + 1
end end
end end
end
table.sort(pending) table.sort(pending)
-- set player context -- set player context