diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java
index f289786..f0a8bb7 100644
--- a/src/de/steamwar/bungeecore/BungeeCore.java
+++ b/src/de/steamwar/bungeecore/BungeeCore.java
@@ -122,6 +122,7 @@ public class BungeeCore extends Plugin {
new UnIgnoreCommand();
new PollresultCommand();
new ResourcereloadCommand();
+ new ListCommand();
new StatCommand();
if(!EVENT_MODE){
diff --git a/src/de/steamwar/bungeecore/commands/ListCommand.java b/src/de/steamwar/bungeecore/commands/ListCommand.java
new file mode 100644
index 0000000..b5d2f2d
--- /dev/null
+++ b/src/de/steamwar/bungeecore/commands/ListCommand.java
@@ -0,0 +1,75 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package de.steamwar.bungeecore.commands;
+
+import de.steamwar.bungeecore.Message;
+import de.steamwar.bungeecore.Servertype;
+import de.steamwar.bungeecore.Subserver;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+public class ListCommand extends BasicCommand {
+
+ public ListCommand() {
+ super("list", "");
+ }
+
+ private final TreeMap> playerMap = new TreeMap<>();
+
+ private synchronized void updateCustomTablist(){
+ //Calculate server-player-map
+ playerMap.clear();
+ for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) {
+ Server pserver = player.getServer();
+ if (pserver == null) //Happens temporarily
+ continue;
+
+ ServerInfo server = pserver.getInfo();
+ String serverName = server.getName();
+
+ Subserver subserver = Subserver.getSubserver(server);
+ if (subserver != null && subserver.getType() == Servertype.BAUSERVER) {
+ playerMap.computeIfAbsent("Bau", s -> new ArrayList<>()).add(player);
+ } else {
+ playerMap.computeIfAbsent(serverName, s -> new ArrayList<>()).add(player);
+ }
+ }
+ playerMap.forEach((server, players) -> players.sort((proxiedPlayer, t1) -> proxiedPlayer.getName().compareToIgnoreCase(t1.getName())));
+ }
+
+ @Override
+ public void execute(CommandSender commandSender, String[] strings) {
+ updateCustomTablist();
+ for (String server : playerMap.navigableKeySet()) {
+ if (server.equals("Bau")) {
+ server = Message.parse("TABLIST_BAU", commandSender);
+ }
+ Message.send("LIST_COMMAND", commandSender, server, playerMap.get(server).stream().map(CommandSender::getName).collect(Collectors.joining(", ")));
+ }
+ }
+}
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index e6bed0a..eab98a5 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -484,6 +484,7 @@ TABLIST_PHASE_1=§8Teamspeak: §eSteam§8War.de
TABLIST_PHASE_2=§8Discord: §8https://§eSteam§8War.de/discord
TABLIST_PHASE_DEFAULT=§8Website: https://§eSteam§8War.de
TABLIST_BAU=Bau
+LIST_COMMAND=§e{0}§8: §7{1}
#EventStarter
EVENT_FIGHT_BROADCAST=§7Hier §eklicken §7für den Kampf §{0}{1} §8vs §{2}{3}