Fixed Command Middleware Bug

This commit is contained in:
Cooldude2606
2018-10-27 19:55:45 +01:00
parent ec9a8db362
commit b601664526
4 changed files with 23 additions and 14 deletions

View File

@@ -209,7 +209,7 @@ local function run_custom_command(command)
local player = Game.get_player(command) or SERVER
-- runs all middle ware if any, if there is no middle where then it relyis on .default_admin_only
if #middleware > 0 then for _,callback in pairs(middleware) do
local success, err = pcall(callback,player_name,command.name,command)
local success, err = pcall(callback,player,command.name,command)
if not success then error(err)
elseif not err then
player_return({'ExpGamingCore_Command.unauthorized'},defines.textcolor.crit)

View File

@@ -23,6 +23,6 @@ commands.add_validation('player-rank-alive',function(value,event)
return player
end)
commands.add_middleware(function(player_name,command_name,event)
return Role.allowed(player_name,command_name)
commands.add_middleware(function(player,command_name,event)
return Role.allowed(player,command_name)
end)

View File

@@ -25,10 +25,12 @@ function Sync.count_roles()
local _roles = {}
for name,role in pairs(Role.roles) do
local players = role:get_players()
for k,player in pairs(players) do players[k] = player.name end
local _players = {}
for k,player in pairs(players) do _players[k] = player.name end
local online = role:get_players(true)
for k,player in pairs(online) do online[k] = player.name end
_roles[role.name] = {players=players,online=online,n_players=#players,n_online=#online}
local _online = {}
for k,player in pairs(online) do _online[k] = player.name end
_roles[role.name] = {players=_players,online=_online,n_players=#_players,n_online=#_online}
end
return _roles
end