This commit is contained in:
Anuken
2020-06-08 17:19:47 -04:00
parent 87ab895253
commit 8ea28e1ced
147 changed files with 438 additions and 437 deletions

View File

@ -3,7 +3,7 @@ package mindustry.server;
import arc.*;
import arc.files.*;
import arc.struct.*;
import arc.struct.Array.*;
import arc.struct.Seq.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.Timer;
@ -85,7 +85,7 @@ public class ServerControl implements ApplicationListener{
registerCommands();
Core.app.post(() -> {
Array<String> commands = new Array<>();
Seq<String> commands = new Seq<>();
if(args.length > 0){
commands.addAll(Strings.join(" ", args).split(","));
@ -616,7 +616,7 @@ public class ServerControl implements ApplicationListener{
});
handler.register("bans", "List all banned IPs and IDs.", arg -> {
Array<PlayerInfo> bans = netServer.admins.getBanned();
Seq<PlayerInfo> bans = netServer.admins.getBanned();
if(bans.size == 0){
info("No ID-banned players have been found.");
@ -627,7 +627,7 @@ public class ServerControl implements ApplicationListener{
}
}
Array<String> ipbans = netServer.admins.getBannedIPs();
Seq<String> ipbans = netServer.admins.getBannedIPs();
if(ipbans.size == 0){
info("No IP-banned players have been found.");
@ -699,7 +699,7 @@ public class ServerControl implements ApplicationListener{
});
handler.register("admins", "List all admins.", arg -> {
Array<PlayerInfo> admins = netServer.admins.getAdmins();
Seq<PlayerInfo> admins = netServer.admins.getAdmins();
if(admins.size == 0){
info("No admins have been found.");
@ -879,7 +879,7 @@ public class ServerControl implements ApplicationListener{
private void play(boolean wait, Runnable run){
inExtraRound = true;
Runnable r = () -> {
Array<Playerc> players = new Array<>();
Seq<Playerc> players = new Seq<>();
for(Playerc p : Groups.player){
players.add(p);
p.clearUnit();
@ -897,7 +897,7 @@ public class ServerControl implements ApplicationListener{
p.reset();
if(state.rules.pvp){
p.team(netServer.assignTeam(p, new ArrayIterable<>(players)));
p.team(netServer.assignTeam(p, new SeqIterable<>(players)));
}
netServer.sendWorldData(p);
}