Merge branch 'core'

This commit is contained in:
Cooldude2606
2018-04-18 19:11:20 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -110,7 +110,7 @@ local function run_custom_command(command)
-- runs the command
local success, err = pcall(command_calls[command.name],command,args)
if not success then error(err) end
if err ~= commands.error then player_return({'commands.command-ran'},defines.text_color.info) end
if err ~= commands.error and player_name ~= 'server' then player_return({'commands.command-ran'},defines.text_color.info) end
game.write_file('commands.log',
game.tick
..' Player: "'..player_name..'"'

View File

@@ -177,7 +177,7 @@ function Ranking._auto_edit_ranks()
end
end
for power = #ranks, 1, -1 do
rank = ranks[power]
local rank = ranks[power]
rank:edit('disallow',false,rank.group.disallow)
if ranks[power+1] then
rank:edit('allow',false,ranks[power+1].allow)