games/RedMew
games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2024-12-14 10:13:13 +02:00
Code Issues Releases Activity

Merge pull request #761 from plague006/fix/unjail_from_report

Browse Source 
Fix unjail from report not working
This commit is contained in:
Matthew 2019-02-16 15:24:27 -05:00 committed by GitHub
commit b394d74b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
features/report.lua
View File

@ -262,21 +262,21 @@ function Module.unjail(target_player, player)
local target_name = target_player.name
local target_index = target_player.index
local permissions = game.permissions
local target_jail_data = jail_data[target_index]
-- Check if the permission group exists, if it doesn't, create it.
local permissions = game.permissions
local jail_permission_group = permissions.get_group(jail_name)
if (not jail_permission_group) or target_player.permission_group ~= jail_permission_group or not target_jail_data then
Game.player_print(format('%s is already not in Jail.', target_name))
return
end
-- Check if the player's former permission group exists, if it doesn't, create it.
local permission_group = target_jail_data.perm_group or permissions.get_group(default_group)
if not permission_group then
permission_group = permissions.create_group(default_group)
end
local jail_permission_group = permissions.get_group(jail_name)
if (not jail_permission_group) or target_player.permission_group ~= jail_permission_group then
Game.player_print(format('%s is already not in Jail.', target_name))
return
end
-- Move player
permission_group.add_player(target_player)
-- Set player to a non-shooting state (solves a niche case where players jailed while shooting will be locked into a shooting state)
@ -329,7 +329,10 @@ Gui.on_click(
Module.jail(target, event.player)
else
target_name = string.sub(event.element.caption, 8)
Module.unjail({['parameter'] = target_name, ['player'] = event.player})
target = game.players[target_name]
if target then
Module.unjail(target, event.player)
end
end
Module.show_reports(event.player)
Module.show_reports(event.player) -- Double toggle, first destroy then draw.