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

Fixed More Bugs

Browse Source
This commit is contained in:
Cooldude2606
2019-01-01 17:04:24 +00:00
parent 1c771ab1b5
commit 02e13ce7b1
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ExpGamingAdmin/Commands/src/reports.lua
View File

@@ -24,7 +24,12 @@ end)
-- @command clear-reports -- @command clear-reports
-- @param player the player to clear the reports of -- @param player the player to clear the reports of
commands.add_command('clear-reports', 'Clears a player\'s reports', { commands.add_command('clear-reports', 'Clears a player\'s reports', {
['player'] = {true,Admin.is_not_banned} ['player'] = {true,function(value)
local player,err = commands.validate['player'](value)
if err then return commands.error(err) end
local rtn = not Admin.is_banned(player) and player
if not rtn then return commands.error{'ExpGamingAdmin.cant-report-ban',value} end return rtn
end}
}, function(event,args) }, function(event,args)
Admin.clear_reports(args.player,event.player_index) Admin.clear_reports(args.player,event.player_index)
end) end)

1
modules/ExpGamingAdmin/control.lua
View File

@@ -6,6 +6,7 @@
-- Module Require -- Module Require
local Game = require('FactorioStdLib.Game') local Game = require('FactorioStdLib.Game')
local Color = require('FactorioStdLib.Color')
local Role -- ExpGamingCore.Role@^4.0.0 local Role -- ExpGamingCore.Role@^4.0.0
local Sync -- ExpGamingCore.Sync@^4.0.0 local Sync -- ExpGamingCore.Sync@^4.0.0
local Server -- ExpGamingCore.Server@^4.0.0 local Server -- ExpGamingCore.Server@^4.0.0

7
modules/ExpGamingCore/Role/control.lua
View File

@@ -210,8 +210,9 @@ function Role.revert(player,by_player,count)
for i = 1,count do for i = 1,count do
local change = table.remove(changes) local change = table.remove(changes)
if not change then break end if not change then break end
if change[1] == 'assign' then Role.unassign(player,change[2],by_player,true) end local batch = is_type(change[2],'table') and change[2] or {change[2]}
if change[1] == 'unassign' then Role.assign(player,change[2],by_player,true) end if change[1] == 'assign' then Role.unassign(player,change[2],by_player,batch) end
if change[1] == 'unassign' then Role.assign(player,change[2],by_player,batch) end
ctn=ctn+1 ctn=ctn+1
end end
return ctn return ctn
@@ -285,7 +286,7 @@ function Role.print(role,rtn,colour,inv)
local i = role.index local i = role.index
while true do while true do
local _role = Role.get(i,true) local _role = Role.get(i,true)
if not role then break end if not _role then break end
ctn=ctn+_role:print(message,colour) ctn=ctn+_role:print(message,colour)
i=i+change i=i+change
end end