aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-29 04:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 4 bugs

Browse Source
This commit is contained in:
Cooldude2606
2019-01-01 02:53:23 +00:00
parent 9a09649635
commit 1c771ab1b5
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ExpGamingAdmin/Commands/src/jail.lua
View File

@@ -1,5 +1,6 @@
local Admin = self
local Role = require('ExpGamingCore.Role')
local Server = require('ExpGamingCore.Server')
--- Used to jail a player which stops them from moving
-- @command jail

2
modules/ExpGamingAdmin/Warnings/control.lua
View File

@@ -128,7 +128,7 @@ script.on_event(defines.events.on_tick,function(event)
local time_to_remove = remove_warnings_time[role.index]
if (game.tick % time_to_remove) == 0 then
global[name]=warnings-1
if global.warnings[name] > 5 then
if global[name] > 5 then
player_return({'ExpGamingAdmin-Warnings.remove-warn',global[name],tick_to_display_format(time_to_remove)},defines.textcolor.low,name)
end
end

10
modules/ExpGamingAdmin/control.lua
View File

@@ -8,6 +8,7 @@
local Game = require('FactorioStdLib.Game')
local Role -- ExpGamingCore.Role@^4.0.0
local Sync -- ExpGamingCore.Sync@^4.0.0
local Server -- ExpGamingCore.Server@^4.0.0
-- Module Define
local module_verbose = false
@@ -15,7 +16,10 @@ local Admin = {
on_init=function()
if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end
if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end
if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server').add_module_to_interface('Admin','ExpGamingAdmin') end
if loaded_modules['ExpGamingCore.Server'] then
Server = require('ExpGamingCore.Server')
Server.add_module_to_interface('Admin','ExpGamingAdmin')
end
end,
actions={},
action_functions={},
@@ -79,10 +83,10 @@ end
function Admin.clear_player(player,by_player)
local player, by_player = Admin.valid_players(player,by_player)
if not player then return end
if Admin.is_banned(player,true) == true then Server.interface(game.unban_player,true,player,by_player) end
if Server and Admin.is_banned(player,true) == true then Server.interface(game.unban_player,true,player,by_player) end
if Admin.clear_warings then Admin.clear_warings(player,by_player,true) end
if Admin.clear_reports then Admin.clear_reports(player,by_player,true) end
if Role.has_flag(player,'is_jail') then Server.interface(Role.revert,true,player,by_player,2) end
if Server and Role.has_flag(player,'is_jail') then Server.interface(Role.revert,true,player,by_player,2) end
if Sync then Sync.emit_embeded{
title='Player Clear',
color=Color.to_hex(defines.textcolor.low),