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

Fixed Cant Report Error

Browse Source
This commit is contained in:
Cooldude2606
2018-11-09 15:54:29 +00:00
parent 5426843a45
commit 5660cf1864
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ExpGamingAdmin/Commands/src/clear.lua
View File

@@ -7,6 +7,6 @@ commands.add_command('clear-inv', 'Clears a player\'s invetory', {
['player'] = {true,'player-rank'} ['player'] = {true,'player-rank'}
}, function(event,args) }, function(event,args)
local player = args.player local player = args.player
if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end
Admin.move_inventory(player) Admin.move_inventory(player)
end) end)

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

@@ -11,8 +11,8 @@ commands.add_command('jail', 'Jails a player', {
}, function(event,args) }, function(event,args)
local player = args.player local player = args.player
local reason = args.reason local reason = args.reason
if Role.has_flag(player,'not_reportable') then player_return{'ExpGamingAdmin.cant-report',args.player} return commands.error end if Role.has_flag(player,'not_reportable') then player_return{'ExpGamingAdmin.cant-report',args.player.name} return commands.error end
if Admin.is_banned(player) then player_return{'ExpGamingCore_Command.cant-report-ban',args.player} return commands.error end if Admin.is_banned(player) then player_return{'ExpGamingCore_Command.cant-report-ban',args.player.name} return commands.error end
Admin.jail(player,event.player_index,reason) Admin.jail(player,event.player_index,reason)
end) end)
@@ -23,6 +23,6 @@ commands.add_command('unjail', 'Returns a player\'s old rank', {
['player']={true,'player'} ['player']={true,'player'}
}, function(event,args) }, function(event,args)
local player = args.player local player = args.player
if Admin.is_banned(player,true) ~= 'jail' then player_return({'ExpGamingCore_Command.cant-report-ban',args.player}) return commands.error end if Admin.is_banned(player,true) ~= 'jail' then player_return({'ExpGamingCore_Command.cant-report-ban',args.player.name}) return commands.error end
Server.interface(Role.revert,true,player,event.player_index,2) Server.interface(Role.revert,true,player,event.player_index,2)
end) end)

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

@@ -12,10 +12,10 @@ commands.add_command('report', 'Reports a player', {
local _player = Game.get_player(event) local _player = Game.get_player(event)
local player = args.player local player = args.player
local reason = args.reason local reason = args.reason
if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end
if Role.has_flag(player,'not_reportable') then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end if Role.has_flag(player,'not_reportable') then player_return({'ExpGamingAdmin.cant-report',args.player.name}) return commands.error end
for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end end for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player.name}) return commands.error end end
for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player}) return commands.error end end for _,report in pairs(global.addons.reports.varified) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player.name}) return commands.error end end
Admin.report(player,event.player_index,reason) Admin.report(player,event.player_index,reason)
end) end)

2
modules/ExpGamingAdmin/Commands/src/tempban.lua
View File

@@ -10,6 +10,6 @@ commands.add_command('temp-ban', 'Temporarily ban a player', {
}, function(event,args) }, function(event,args)
local player = args.player local player = args.player
local reason = args.reason local reason = args.reason
if Admin.is_banned(player) and Admin.is_banned(player,true) ~= 'jail' then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end if Admin.is_banned(player) and Admin.is_banned(player,true) ~= 'jail' then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end
Admin.temp_ban(player,event.player_index,reason) Admin.temp_ban(player,event.player_index,reason)
end) end)

6
modules/ExpGamingAdmin/Commands/src/warnings.lua
View File

@@ -11,8 +11,8 @@ commands.add_command('warn', 'Gives a player a warning', {
}, function(event,args) }, function(event,args)
local player = args.player local player = args.player
local reason = args.reason local reason = args.reason
if Admin.is_banned(player) then player_return{'ExpGamingAdmin.cant-report-ban',args.player} return commands.error end if Admin.is_banned(player) then player_return{'ExpGamingAdmin.cant-report-ban',args.player.name} return commands.error end
if Role.has_flag(player,'not_reportable') then player_return{'ExpGamingAdmin.cant-report',args.player} return commands.error end if Role.has_flag(player,'not_reportable') then player_return{'ExpGamingAdmin.cant-report',args.player.name} return commands.error end
Admin.give_warning(player,event.player_index,reason) Admin.give_warning(player,event.player_index,reason)
end) end)
@@ -23,6 +23,6 @@ commands.add_command('clear-warnings', 'Clears a player\'s warnings', {
['player'] = {true,'player'} ['player'] = {true,'player'}
}, function(event,args) }, function(event,args)
local player = args.player local player = args.player
if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player}) return commands.error end if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end
Admin.clear_warings(player,event.player_index) Admin.clear_warings(player,event.player_index)
end) end)