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

Fixed Issues with jail

Browse Source
This commit is contained in:
Cooldude2606
2020-04-04 20:37:17 +01:00
parent 0a8e5b5564
commit b5d14f9bdd
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/addons/chat-reply.lua
View File

@@ -28,7 +28,7 @@ Event.add(defines.events.on_console_chat,function(event)
else
player.print{'chat-bot.disallow'}
end
else
elseif not allowed then
player.print{'chat-bot.reply',reply}
end
end

6
modules/commands/jail.lua
View File

@@ -20,7 +20,8 @@ Commands.new_command('jail','Puts a player into jail and removes all other roles
reason = reason or 'Non Given.'
local action_player_name_color = format_chat_player_name(action_player)
local by_player_name_color = format_chat_player_name(player)
if Jail.jail_player(action_player,player.name,reason) then
local player_name = player and player.name or '<server>'
if Jail.jail_player(action_player, player_name, reason) then
game.print{'expcom-jail.give',action_player_name_color,by_player_name_color,reason}
else
return Commands.error{'expcom-jail.already-jailed',action_player_name_color}
@@ -37,7 +38,8 @@ Commands.new_command('unjail','Removes a player from jail.')
:register(function(player,action_player,raw)
local action_player_name_color = format_chat_player_name(action_player)
local by_player_name_color = format_chat_player_name(player)
if Jail.unjail_player(action_player,player.name) then
local player_name = player and player.name or '<server>'
if Jail.unjail_player(action_player, player_name) then
game.print{'expcom-jail.remove',action_player_name_color,by_player_name_color}
else
return Commands.error{'expcom-jail.not-jailed',action_player_name_color}

20
modules/control/jail.lua
View File

@@ -114,10 +114,10 @@ function Jail.jail_player(player,by_player_name,reason)
local roles = get_roles(player)
old_roles[player.name] = roles
assign_roles(player,'Jail',by_player_name,true)
unassign_roles(player,old_roles,by_player_name,true)
assign_roles(player, 'Jail', by_player_name, nil, true)
unassign_roles(player, roles, by_player_name, nil, true)
event_emit(Jail.events.on_player_jailed,player,by_player_name,reason)
event_emit(Jail.events.on_player_jailed, player, by_player_name, reason)
return true
end
@@ -134,10 +134,10 @@ function Jail.unjail_player(player,by_player_name)
if not has_role(player,'Jail') then return end
local roles = old_roles[player.name] or {}
assign_roles(player,roles,by_player_name,true)
unassign_roles(player,'Jail',by_player_name,true)
assign_roles(player, roles, by_player_name, nil, true)
unassign_roles(player, 'Jail', by_player_name, nil, true)
event_emit(Jail.events.on_player_unjailed,player,by_player_name)
event_emit(Jail.events.on_player_unjailed, player, by_player_name)
return true
end
@@ -174,8 +174,8 @@ function Jail.temp_ban_player(player,by_player_name,reason)
local roles = get_roles(player)
old_roles[player.name] = roles
assign_roles(player,'Jail',by_player_name,true)
unassign_roles(player,roles,by_player_name,true)
assign_roles(player, 'Jail', by_player_name, nil, true)
unassign_roles(player, roles, by_player_name, nil, true)
end
local inv = player.get_main_inventory()
@@ -202,8 +202,8 @@ function Jail.untemp_ban_player(player,by_player_name)
if has_role(player,'Jail') then
local roles = old_roles[player.name]
assign_roles(player,roles,by_player_name,true)
unassign_roles(player,'Jail',by_player_name,true)
assign_roles(player, roles, by_player_name, nil, true)
unassign_roles(player, 'Jail', by_player_name, nil, true)
end
event_emit(Jail.events.on_player_untemp_banned,player,by_player_name)