aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: set roles after jailing

Browse Source
This commit is contained in:
oof2win2
2022-11-12 22:28:06 +01:00
committed by Cooldude2606
parent 7568da8e8d
commit ceca8fbf00
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
expcore/roles.lua
View File

@@ -115,6 +115,7 @@ local Groups = require 'expcore.permission_groups' --- @dep expcore.permission_g
local Async = require 'expcore.async' --- @dep expcore.async
local Colours = require 'utils.color_presets' --- @dep utils.color_presets
local write_json = _C.write_json --- @dep expcore.common
local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail
local Roles = {
_prototype={},
@@ -368,7 +369,15 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
if not skip_checks and not valid_player then return end
if not player then return end
if type(roles) ~= 'table' or roles.name then
roles = {roles}
roles = { roles }
end
if Roles.player_has_role(player, "Jail") then
local to_assign = JailOldRole.old_roles[valid_player.name] or {}
for _, role in ipairs(roles) do
table.insert(to_assign, role)
end
JailOldRole.old_roles[valid_player.name] = to_assign
return
end
for _, role in ipairs(roles) do
role = Roles.get_role_from_any(role)