Merge branch 'master' into BuilderCloud

CommonCore

@@ -1 +1 @@
-Subproject commit 21e77c55f023261d3a63d5c6200d28b2f6f6fc4c
+Subproject commit 3701f6f5ff10fa97d6816d5f57c85f7213f7fb3e

src/de/steamwar/bungeecore/BungeeCore.java

@@ -48,6 +48,7 @@ import net.md_5.bungee.config.YamlConfiguration;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -57,12 +58,10 @@ import java.util.logging.Level;
 
 public class BungeeCore extends Plugin {
 
+    public static boolean MAIN_SERVER;
+
     public static String CHAT_PREFIX;
-    public static String WORLD_FOLDER;
-    public static String BAUWELT_PROTOTYP;
     public static String LOBBY_SERVER;
-    public static String USERWORLDS15;
-    public static String BAUWELT15;
     public static boolean EVENT_MODE;
 
     private static BungeeCore instance;
@@ -75,6 +74,15 @@ public class BungeeCore extends Plugin {
 
     @Override
     public void onEnable(){
+        getProxy().registerChannel("sw:bridge");
+        getProxy().registerChannel("fabricmodsender:mods");
+
+        setInstance(this);
+        MAIN_SERVER = ProxyServer.getInstance().getConfig().getListeners().stream().anyMatch(info -> ((InetSocketAddress) info.getSocketAddress()).getPort() == 25565);
+        loadConfig();
+
+        errorLogger = new ErrorLogger();
+
         SWCommandUtils.init((SWTypeMapperCreator<TypeMapper<Object>, CommandSender, Object>) (mapper, tabCompleter) -> new TypeMapper<Object>() {
             @Override
             public Object map(CommandSender commandSender, String[] previousArguments, String s) {
@@ -88,13 +96,6 @@ public class BungeeCore extends Plugin {
         });
         BungeeCord.getInstance().getScheduler().schedule(this, TabCompletionCache::invalidateOldEntries, 1, 1, TimeUnit.SECONDS);
 
-        getProxy().registerChannel("sw:bridge");
-        getProxy().registerChannel("fabricmodsender:mods");
-
-        setInstance(this);
-        loadConfig();
-
-        errorLogger = new ErrorLogger();
         new ConnectionListener();
         new Forge();
         new Forge12();
@@ -164,7 +165,7 @@ public class BungeeCore extends Plugin {
 
         if(!EVENT_MODE){
             new BauCommand();
-            new WebregisterCommand();
+            new WebpasswordCommand();
             new FightCommand();
             new ChallengeCommand();
             new HistoricCommand();
@@ -295,21 +296,13 @@ public class BungeeCore extends Plugin {
         }
 
         CHAT_PREFIX = config.getString("prefix");
-        WORLD_FOLDER = config.getString("worldfolder");
-        BAUWELT_PROTOTYP = config.getString("bauweltprototyp");
         LOBBY_SERVER = config.getString("lobbyserver");
-        USERWORLDS15 = config.getString("userworlds15");
-        BAUWELT15 = config.getString("bauwelt15");
         EVENT_MODE = config.getBoolean("eventmode");
         Broadcaster.setBroadCastMsgs(config.getStringList("broadcasts").toArray(new String[1]));
         PollSystem.init(config.getString("poll.question"), config.getStringList("poll.answers"));
         Persistent.setChatPrefix(CHAT_PREFIX);
         Persistent.setLobbyServer(LOBBY_SERVER);
 
-        if (config.contains("discord")) {
-            SteamwarDiscordBotConfig.loadConfig(config.getSection("discord"));
-        }
-
         final Configuration servers = config.getSection("servers");
         for(final String serverName : servers.getKeys()){
             final Configuration server = servers.getSection(serverName);
@@ -326,6 +319,15 @@ public class BungeeCore extends Plugin {
                 ModLoaderBlocker.addServer(serverName);
             }
         }
+
+        File discordFile = new File(System.getProperty("user.home"), "discord.yml");
+        if(discordFile.exists()) {
+            try {
+                SteamwarDiscordBotConfig.loadConfig(ConfigurationProvider.getProvider(YamlConfiguration.class).load(discordFile));
+            } catch (IOException e) {
+                get().getLogger().log(Level.SEVERE, "Could not load discord bot configuration", e);
+            }
+        }
     }
 
     private static void setInstance(BungeeCore core){

src/de/steamwar/bungeecore/ErrorLogger.java

@@ -90,6 +90,7 @@ public class ErrorLogger extends Handler {
         contains.add("No client connected for pending server");
         contains.add("Error occurred processing connection for");
         contains.add("Server is online mode!");
+        contains.add(" took ");
         ignoreContains = Collections.unmodifiableList(contains);
     }
 }

src/de/steamwar/bungeecore/ServerStarter.java

@@ -4,7 +4,6 @@ import de.steamwar.bungeecore.sql.EventFight;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import de.steamwar.bungeecore.sql.Team;
 import de.steamwar.bungeecore.sql.Tutorial;
-import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.io.File;
@@ -17,16 +16,17 @@ import java.util.stream.Collectors;
 
 public class ServerStarter {
 
-    private static final boolean MAIN_SERVER = ProxyServer.getInstance().getConfig().getListeners().stream().anyMatch(info -> ((InetSocketAddress) info.getSocketAddress()).getPort() == 25565);
+    private static final Portrange BAU_PORTS = BungeeCore.MAIN_SERVER ? new Portrange(10100, 20000) : new Portrange(2100, 2200);
-    private static final Portrange BAU_PORTS = MAIN_SERVER ? new Portrange(10100, 20000) : new Portrange(2100, 2200);
+    private static final Portrange ARENA_PORTS = BungeeCore.MAIN_SERVER ? new Portrange(3000, 3100) : (BungeeCore.EVENT_MODE ? new Portrange(4000, 5000) : BAU_PORTS);
-    private static final Portrange ARENA_PORTS = MAIN_SERVER ? new Portrange(3000, 3100) : (BungeeCore.EVENT_MODE ? new Portrange(4000, 5000) : BAU_PORTS);
 
-    private static final String BACKBONE = "/home/minecraft/";
+    private static final String SERVER_PATH = "/servers/";
-    private static final String SERVER_PATH = BACKBONE + "server/";
+    private static final String USER_HOME = System.getProperty("user.home") + "/";
-    private static final String EVENT_PATH = BACKBONE + "event/";
+    private static final String EVENT_PATH = USER_HOME + "event/";
-    public static final String TEMP_WORLD_PATH =  BACKBONE + "arenaserver/";
+    public static final String TEMP_WORLD_PATH =  USER_HOME + "arenaserver/";
-    public static final String TUTORIAL_PATH = BACKBONE + "tutorials/";
+    public static final String TUTORIAL_PATH = USER_HOME + "tutorials/";
-    public static final String WORLDS19_PATH = BACKBONE + "userworlds19/";
+    public static final String WORLDS12_PATH = USER_HOME + "userworlds/";
+    public static final String WORLDS15_PATH = USER_HOME + "userworlds15/";
+    public static final String WORLDS19_PATH = USER_HOME + "userworlds19/";
 
     public static final String BUILDER15_PATH = BACKBONE + "builder15/";
     public static final String BUILDER19_PATH = BACKBONE + "builder19/";
@@ -122,7 +122,7 @@ public class ServerStarter {
 
     public ServerStarter build19(UUID owner) {
         directory = new File(SERVER_PATH, "Bau19");
-        serverJar = "paper-1.19.jar";
+        serverJar = "paper-1.19.2.jar";
         worldDir = WORLDS19_PATH;
         worldName = String.valueOf(SteamwarUser.get(owner).getId());
         buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
@@ -131,19 +131,19 @@ public class ServerStarter {
 
     public ServerStarter build15(UUID owner) {
         directory = new File(SERVER_PATH, "Bau15");
-        worldDir = BungeeCore.USERWORLDS15;
+        worldDir = WORLDS15_PATH;
         worldName = String.valueOf(SteamwarUser.get(owner).getId());
-        buildWithWorld(owner, BungeeCore.BAUWELT15);
+        buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
         return this;
     }
 
     public ServerStarter build12(UUID owner) {
-        directory = new File(SERVER_PATH, "UserBau");
+        directory = new File(SERVER_PATH, "Bau12");
         serverJar = "spigot-1.12.2.jar";
         xmx = "256M";
-        worldDir = BungeeCore.WORLD_FOLDER;
+        worldDir = WORLDS12_PATH;
         worldName = owner.toString();
-        buildWithWorld(owner, BungeeCore.BAUWELT_PROTOTYP);
+        buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
         return this;
     }
 

src/de/steamwar/bungeecore/commands/ArenaCommand.java

@@ -19,33 +19,53 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.Servertype;
 import de.steamwar.bungeecore.Subserver;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeMapper;
 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;
 
-public class ArenaCommand extends BasicCommand {
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ArenaCommand extends SWCommand {
 
     public ArenaCommand() {
-        super("arena", null);
+        super("arena");
     }
 
-    @Override
+    @Register
-    public void execute(CommandSender sender, String[] args) {
+    public void arenaJoin(ProxiedPlayer player, Subserver server) {
-        if(!(sender instanceof ProxiedPlayer))
+        TpCommand.teleport(player, server.getServer());
-            return;
+    }
-        ProxiedPlayer player = (ProxiedPlayer) sender;
 
-        ServerInfo server = ProxyServer.getInstance().getServerInfo(String.join(" ", args));
+    @ClassMapper(value = Subserver.class, local = true)
-        Subserver subserver = Subserver.getSubserver(server);
+    public TypeMapper<Subserver> serverInfoTypeMapper() {
-        if(server == null || subserver == null || subserver.getType() != Servertype.ARENA) {
+        return new TypeMapper<Subserver>() {
-            Message.send("ARENA_NOT_FOUND", player);
+            @Override
-            return;
+            public Subserver map(CommandSender commandSender, String[] previousArguments, String s) {
-        }
+                return Subserver.getSubserver(ProxyServer.getInstance().getServerInfo(s));
+            }
 
-        TpCommand.teleport(player, server);
+            @Override
+            public boolean validate(CommandSender sender, Subserver value, MessageSender messageSender) {
+                if (value == null || value.getType() != Servertype.ARENA) {
+                    messageSender.send("ARENA_NOT_FOUND");
+                    return false;
+                }
+                return true;
+            }
+
+            @Override
+            public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
+                List<Subserver> subserverList = Subserver.getServerList();
+                synchronized (subserverList) {
+                    return subserverList.stream().filter(subserver -> subserver.getType() == Servertype.ARENA).map(subserver -> subserver.getServer().getName()).collect(Collectors.toList());
+                }
+            }
+        };
     }
 }

src/de/steamwar/bungeecore/commands/BauCommand.java

@@ -139,7 +139,9 @@ public class BauCommand extends BasicCommand {
     private static void versionSelector(ProxiedPlayer p, String[] args, int pos, Runnable run19, Runnable run15, Runnable run12, Runnable runElse) {
         if(args.length <= pos) {
             int version = p.getPendingConnection().getVersion();
-            if(version > 340) { // Version > 1.12.2
+            if(version > 578) { // Version > 1.15.2
+                run19.run();
+            } else if(version > 340) { // Version > 1.12.2
                 run15.run();
             } else {
                 run12.run();
@@ -150,16 +152,14 @@ public class BauCommand extends BasicCommand {
         switch (args[pos].toLowerCase()) {
             case "19":
             case "1.19":
-            case "18":
+            case "mwg":
-            case "1.18":
+            case "miniwargear":
                 run19.run();
                 break;
             case "ws":
             case "warship":
             case "as":
             case "airship":
-            case "mwg":
-            case "miniwargear":
             case "wg":
             case "wargear":
             case "15":
@@ -236,8 +236,8 @@ public class BauCommand extends BasicCommand {
         SteamwarUser user = SteamwarUser.get(p.getUniqueId());
         versionSelector(p, args, 1,
                 () -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS19_PATH + user.getId())),
-                () -> deleteConfirmation(p, () -> deleteWorld(p, BungeeCore.USERWORLDS15 + user.getId())),
+                () -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS15_PATH + user.getId())),
-                () -> deleteConfirmation(p, () -> deleteWorld(p, BungeeCore.WORLD_FOLDER + p.getUniqueId().toString())),
+                () -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS12_PATH + p.getUniqueId().toString())),
                 () -> HelpCommand.sendBauHelp(ChatSender.of(p)));
     }
 
@@ -246,9 +246,10 @@ public class BauCommand extends BasicCommand {
         inventory.addItem(8, new SWItem(Message.parse("BAU_DELETE_GUI_CANCEL", p), 1), click ->
                 inventory.close()
         );
-        inventory.addItem(0, new SWItem(Message.parse("BAU_DELETE_GUI_DELETE", p), 10), click ->
+        inventory.addItem(0, new SWItem(Message.parse("BAU_DELETE_GUI_DELETE", p), 10), click -> {
-                worldDeletion.run()
+                worldDeletion.run();
-        );
+                inventory.close();
+        });
         inventory.open();
     }
 

src/de/steamwar/bungeecore/commands/DevCommand.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.bungeecore.commands;
 
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.Punishment;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import de.steamwar.command.*;
@@ -42,7 +43,7 @@ public class DevCommand extends SWCommand {
     }
 
     @Register
-    public void simpleCommand(@Guard ProxiedPlayer player) {
+    public void simpleCommand(@Validator ProxiedPlayer player) {
         updateDevServers();
         ChatSender sender = ChatSender.of(player);
         if (devServers.isEmpty()) {
@@ -63,7 +64,7 @@ public class DevCommand extends SWCommand {
     }
 
     @Register
-    public void selectedCommand(@Guard ProxiedPlayer player, @Mapper("dev") String name) {
+    public void selectedCommand(@Validator ProxiedPlayer player, @Mapper("dev") String name) {
         updateDevServers();
         ChatSender sender = ChatSender.of(player);
         ServerInfo info = devServers.get(name.toLowerCase());
@@ -75,20 +76,16 @@ public class DevCommand extends SWCommand {
         player.connect(info);
     }
 
-    @ClassGuard(value = ProxiedPlayer.class, local = true)
+    @ClassValidator(value = ProxiedPlayer.class, local = true)
-    public GuardChecker punishmentGuardChecker() {
+    public TypeValidator<ProxiedPlayer> punishmentGuardChecker() {
-        return (commandSender, guardCheckType, previousArguments, s) -> {
+        return (sender, value, messageSender) -> {
-            ChatSender sender = ChatSender.of(commandSender);
+            SteamwarUser user = SteamwarUser.get(value);
-            if (guardCheckType == GuardCheckType.COMMAND) {
+            if (user.isPunished(Punishment.PunishmentType.NoDevServer)) {
-                if (sender.user().isPunishedWithMessage(sender, Punishment.PunishmentType.NoDevServer)) {
+                Message message = user.punishmentMessage(Punishment.PunishmentType.NoDevServer);
-                    return GuardResult.DENIED;
+                messageSender.send(message.getFormat(), message.getParams());
-                }
+                return false;
-            } else {
-                if (sender.user().isPunished(Punishment.PunishmentType.NoDevServer)) {
-                    return GuardResult.DENIED;
-                }
             }
-            return GuardResult.ALLOWED;
+            return true;
         };
     }
 

src/de/steamwar/bungeecore/commands/HelpCommand.java

@@ -36,17 +36,17 @@ public class HelpCommand extends BasicCommand {
         if (args.length < 1) {
             printPage(sender, ClickEvent.Action.RUN_COMMAND,
                     "HELP_LOBBY", "/l",
-                    "HELP_BAU", "/bau",
+                    "HELP_BAU", "/build",
-                    "HELP_BAUSERVER", "/help bau",
+                    "HELP_BAUSERVER", "/help build",
                     "HELP_FIGHT", "/fight",
                     "HELP_CHALLENGE", "/challenge",
                     "HELP_HISTORIC", "/historic",
                     "HELP_TEAM", "/team",
                     "HELP_JOIN", "/join",
                     "HELP_LOCAL", "/local");
-        }else if (args[0].equalsIgnoreCase("bauserver")) {
+        }else if (args[0].equalsIgnoreCase("buildserver")) {
             sendBauHelp(sender);
-        }else if (args[0].equalsIgnoreCase("bau")) {
+        }else if (args[0].equalsIgnoreCase("build")) {
             bauHelpGroup(sender, args);
         }
     }
@@ -86,22 +86,22 @@ public class HelpCommand extends BasicCommand {
 
     private static void sendBauHelpGroup(ChatSender sender) {
         printPage(sender, ClickEvent.Action.RUN_COMMAND,
-                "HELP_BAU_GROUP_ADMIN", "/help bau admin",
+                "HELP_BAU_GROUP_ADMIN", "/help build admin",
-                "HELP_BAU_GROUP_WORLD", "/help bau world",
+                "HELP_BAU_GROUP_WORLD", "/help build world",
-                "HELP_BAU_GROUP_PLAYER", "/help bau player",
+                "HELP_BAU_GROUP_PLAYER", "/help build player",
-                "HELP_BAU_GROUP_WE", "/help bau we",
+                "HELP_BAU_GROUP_WE", "/help build we",
-                "HELP_BAU_GROUP_OTHER", "/help bau other");
+                "HELP_BAU_GROUP_OTHER", "/help build other");
     }
 
     static void sendBauHelp(ChatSender sender) {
         printPage(sender, ClickEvent.Action.SUGGEST_COMMAND,
-                "HELP_BAU_TP", "/bau tp ",
+                "HELP_BAU_TP", "/build tp ",
-                "HELP_BAU_ADDMEMBER", "/bau addmember ",
+                "HELP_BAU_ADDMEMBER", "/build addmember ",
-                "HELP_BAU_DELMEMBER", "/bau delmember ",
+                "HELP_BAU_DELMEMBER", "/build delmember ",
-                "HELP_BAU_TOGGLEWE", "/bau togglewe ",
+                "HELP_BAU_TOGGLEWE", "/build togglewe ",
-                "HELP_BAU_TOGGLEWORLD", "/bau toggleworld ",
+                "HELP_BAU_TOGGLEWORLD", "/build toggleworld ",
-                "HELP_BAU_DELETE", "/bau delete ",
+                "HELP_BAU_DELETE", "/build delete ",
-                "HELP_BAU_TESTARENA", "/bau testarena ");
+                "HELP_BAU_TESTARENA", "/build testarena ");
     }
 
     private static void printPage(ChatSender sender, ClickEvent.Action action, String... args) {

src/de/steamwar/bungeecore/commands/PollCommand.java

@@ -23,11 +23,8 @@ import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.listeners.PollSystem;
 import de.steamwar.bungeecore.sql.PollAnswer;
 import de.steamwar.bungeecore.sql.SteamwarUser;
-import de.steamwar.command.GuardCheckType;
-import de.steamwar.command.GuardChecker;
-import de.steamwar.command.GuardResult;
 import de.steamwar.command.SWCommand;
-import net.md_5.bungee.api.CommandSender;
+import de.steamwar.command.TypeValidator;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class PollCommand extends SWCommand {
@@ -37,12 +34,12 @@ public class PollCommand extends SWCommand {
     }
 
     @Register
-    public void genericCommand(@Guard ProxiedPlayer player) {
+    public void genericCommand(ProxiedPlayer player) {
         PollSystem.sendPoll(player);
     }
 
     @Register(noTabComplete = true)
-    public void answerPoll(@Guard ProxiedPlayer player, String answerString) {
+    public void answerPoll(@Validator ProxiedPlayer player, String answerString) {
         int answer;
         try {
             answer = Integer.parseUnsignedInt(answerString);
@@ -62,16 +59,14 @@ public class PollCommand extends SWCommand {
         pollAnswer.setAnswer(answer);
     }
 
-    @ClassGuard(value = ProxiedPlayer.class, local = true)
+    @ClassValidator(value = ProxiedPlayer.class, local = true)
-    public GuardChecker noPoll() {
+    public TypeValidator<ProxiedPlayer> noPoll() {
-        return (commandSender, guardCheckType, previousArguments, s) -> {
+        return (sender, value, messageSender) -> {
             if(PollSystem.noCurrentPoll()){
-                if (guardCheckType == GuardCheckType.COMMAND) {
+                messageSender.send("POLL_NO_POLL");
-                    Message.send("POLL_NO_POLL", commandSender);
+                return false;
-                }
-                return GuardResult.DENIED;
             }
-            return GuardResult.ALLOWED;
+            return true;
         };
     }
 }

src/de/steamwar/bungeecore/commands/PollresultCommand.java

@@ -22,10 +22,8 @@ package de.steamwar.bungeecore.commands;
 import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.listeners.PollSystem;
 import de.steamwar.bungeecore.sql.PollAnswer;
-import de.steamwar.command.GuardCheckType;
-import de.steamwar.command.GuardChecker;
-import de.steamwar.command.GuardResult;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.util.Map;
@@ -37,7 +35,7 @@ public class PollresultCommand extends SWCommand {
     }
 
     @Register
-    public void genericCommand(@Guard ProxiedPlayer player) {
+    public void genericCommand(@Validator ProxiedPlayer player) {
         Map<String, Integer> voted = PollAnswer.getCurrentResults();
         Message.send("POLLRESULT_HEADER", player, voted.values().stream().reduce(Integer::sum).orElse(0), PollSystem.getQuestion());
         for (Map.Entry<String, Integer> e: voted.entrySet()) {
@@ -45,16 +43,14 @@ public class PollresultCommand extends SWCommand {
         }
     }
 
-    @ClassGuard(value = ProxiedPlayer.class, local = true)
+    @ClassValidator(value = ProxiedPlayer.class, local = true)
-    public GuardChecker noPoll() {
+    public TypeValidator<ProxiedPlayer> noPoll() {
-        return (commandSender, guardCheckType, previousArguments, s) -> {
+        return (sender, value, messageSender) -> {
-            if(PollSystem.noCurrentPoll()){
+            if (PollSystem.noCurrentPoll()) {
-                if (guardCheckType == GuardCheckType.COMMAND) {
+                messageSender.send("POLL_NO_POLL");
-                    Message.send("POLL_NO_POLL", commandSender);
+                return false;
-                }
-                return GuardResult.DENIED;
             }
-            return GuardResult.ALLOWED;
+            return true;
         };
     }
 }

src/de/steamwar/bungeecore/commands/RegelnCommand.java

@@ -21,13 +21,12 @@ package de.steamwar.bungeecore.commands;
 
 import de.steamwar.bungeecore.Message;
 import de.steamwar.command.SWCommand;
-import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class RegelnCommand extends SWCommand {
     public RegelnCommand() {
-        super("regeln");
+        super("regeln", null, "rules");
     }
 
     @Register

src/de/steamwar/bungeecore/commands/TpCommand.java

@@ -56,14 +56,10 @@ public class TpCommand extends BasicCommand {
         boolean onTeamServer = Storage.teamServers.containsValue(player.getServer().getInfo());
 
         //Give control of teleport command to server
-        if (server == player.getServer().getInfo() || onTeamServer) {
+        if (server == player.getServer().getInfo() || onTeamServer || server == null) {
             Chat19.chat(player, "/tp " + String.join(" ", args));
             return;
         }
-        if(server == null) {
-            sender.system("JOINME_PLAYER_OFFLINE");
-            return;
-        }
 
         teleport(player, server);
     }

src/de/steamwar/bungeecore/commands/TutorialCommand.java

@@ -26,9 +26,8 @@ import de.steamwar.bungeecore.inventory.SWListInv;
 import de.steamwar.bungeecore.inventory.SWStreamInv;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import de.steamwar.bungeecore.sql.Tutorial;
-import de.steamwar.command.GuardChecker;
-import de.steamwar.command.GuardResult;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
@@ -78,22 +77,14 @@ public class TutorialCommand extends SWCommand {
     }
 
     @Register("unreleased")
-    public void unreleased(@Guard("unreleased") ProxiedPlayer player) {
+    public void unreleased(@Validator("unreleased") ProxiedPlayer player) {
         openInventory(player, false, false);
     }
 
-    @Guard("unreleased")
+    @Validator("unreleased")
-    public GuardChecker unreleasedChecker() {
+    public TypeValidator<ProxiedPlayer> unreleasedChecker() {
-        return (commandSender, guardCheckType, previousArguments, s) -> {
+        return (sender, value, messageSender) -> {
-            if (commandSender instanceof ProxiedPlayer) {
+            return (SteamwarUser.get((value).getUniqueId()).getUserGroup().isTeamGroup());
-                if (SteamwarUser.get(((ProxiedPlayer) commandSender).getUniqueId()).getUserGroup().isTeamGroup()) {
-                    return GuardResult.ALLOWED;
-                } else {
-                    return GuardResult.DENIED_WITH_HELP;
-                }
-            } else {
-                return GuardResult.ALLOWED;
-            }
         };
     }
 

src/de/steamwar/bungeecore/commands/WebpasswordCommand.java

@@ -19,58 +19,45 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.Message;
-import de.steamwar.bungeecore.sql.SWException;
 import de.steamwar.command.SWCommand;
+import de.steamwar.messages.ChatSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-public class WebregisterCommand extends SWCommand {
+public class WebpasswordCommand extends SWCommand {
 
-    public WebregisterCommand() {
+    public WebpasswordCommand() {
-        super("webregister", null, "web", "webpw");
+        super("webpassword", null, "webpw", "web");
     }
 
+
     @Register(description = "WEB_USAGE")
-    public void genericCommand(ProxiedPlayer player, String email) {
+    public void genericCommand(ProxiedPlayer player, String password) {
-        ProcessBuilder pb = new ProcessBuilder("php", "/var/www/register.php", player.getName(), email);
+        if(password.length() < 8) {
+            ChatSender.of(player).system("WEB_PASSWORD_LENGTH");
+            return;
+        }
+
+        ProcessBuilder pb = new ProcessBuilder("php", "/var/www/register.php", player.getName(), password);
         pb.redirectErrorStream(true);
         try {
             Process regProcess = pb.start();
             BufferedReader reader = new BufferedReader(new InputStreamReader(regProcess.getInputStream()));
             String errorLine;
-            boolean error = false;
+            if((errorLine = reader.readLine()) != null) {
-            while((errorLine = reader.readLine()) != null){
+                if ("updated".equals(errorLine)) {
-                switch(errorLine){
+                    ChatSender.of(player).system("WEB_UPDATED");
-                    case "username_exists":
+                    return;
-                        Message.send("WEB_ALREADY", player);
+                } else {
-                        break;
+                    throw new SecurityException("Could not create webaccount " + errorLine);
-                    case "email_exists":
-                        Message.send("WEB_ALREADY_EMAIL", player);
-                        // SWException.log("Bungee", "Duplicate E-Mail", player.getName() + " " + args[0]);
-                        break;
-                    case "invalid_email":
-                        Message.send("WEB_NOT_EMAIL", player);
-                        break;
-                    case "email_updated":
-                        Message.send("WEB_EMAIL_REFRESH", player);
-                        break;
-                    default:
-                        Message.send("WEB_INTERNAL_ERROR", player);
-                        SWException.log("Bungee", "Unknown Wordpress User Creation Error", errorLine);
                 }
-                error = true;
             }
 
-            if(error)
+            ChatSender.of(player).system("WEB_CREATED");
-                return;
-
-            Message.send("WEB_EMAIL_SEND", player);
         } catch (IOException e) {
-            Message.send("WEB_INTERNAL_ERROR", player);
             throw new SecurityException("Could not create webaccount", e);
         }
     }

src/de/steamwar/bungeecore/commands/WhoisCommand.java

@@ -44,7 +44,7 @@ public class WhoisCommand extends SWCommand {
     }
 
     @Register(description = "WHOIS_USAGE")
-    public void genericCommand(ProxiedPlayer player, @Mapper("player") String target, @OptionalValue("") @StaticValue({"-all", "-a", ""}) String displayAll) {
+    public void genericCommand(ProxiedPlayer player, @Mapper("player") String target, @OptionalValue("") @StaticValue(value = {"", "-all", "-a"}, allowISE = true) boolean all) {
         SteamwarUser user = SteamwarUser.get(target);
         if (user == null) {
             try {
@@ -64,11 +64,9 @@ public class WhoisCommand extends SWCommand {
 
         if (user == null) {
             Message.send("UNKNOWN_PLAYER", player);
-            return;
+        } else {
+            sendUserinfo(player, user, all);
         }
-
-        boolean all = displayAll.contains("-");
-        sendUserinfo(player, user, all);
     }
 
     @Mapper(value = "player", local = true)

src/de/steamwar/bungeecore/listeners/ChatListener.java

@@ -56,53 +56,64 @@ public class ChatListener extends BasicListener {
         ProxiedPlayer player = (ProxiedPlayer) e.getSender();
         String message = e.getMessage();
 
+        e.setCancelled(true);
+
         if (message.contains("jndi:ldap")) {
-            e.setCancelled(true);
             SteamwarUser.get(player).punishPerma(Punishment.PunishmentType.Ban, "Versuchte Exploit-Ausnutzung", 0);
             return;
         }
 
-        message = sanitize7(message);
+        if (isCommand(player, message))
+            return;
 
-        if (message.startsWith("/")) {
+        Subserver subserver = Subserver.getSubserver(player);
-            if(filteredCommand((CommandSender) e.getSender(), message))
+        if(subserver != null && subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo()) {
-                e.setCancelled(true);
+            localChat(player, message);
+        } else if (message.startsWith("+")) {
+            localChat(player, message.substring(1));
         } else {
-            e.setCancelled(true);
+            sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", null, message);
-
-            Subserver subserver = Subserver.getSubserver(player);
-            if(subserver != null && subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo()) {
-                localChat(player, message);
-            } else if (message.startsWith("+")) {
-                localChat(player, message.substring(1));
-            } else {
-                sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", null, message);
-            }
         }
     }
 
-    public static void sendChat(ChatSender sender, Stream<ChatSender> receivers, String format, ChatSender msgReceiver, String message) {
+    private static boolean isCommand(ProxiedPlayer player, String message) {
-        String finalMessage = modifyFilter(sender, message);
+        String command = message.substring(1);
-        if(finalMessage == null)
+        boolean isCommand = message.startsWith("/") || (message.startsWith("7") && command.split(" ", 2)[0].matches("[7/]?[A-Za-z]+"));
-            return;
+        if(isCommand && !ProxyServer.getInstance().getPluginManager().dispatchCommand(player, command)) {
+            if(command.startsWith("7"))
+                command = "/" + command.substring(1);
+            message = "/" + command;
 
+            if(filteredCommand(player, message))
+                return true;
+
+            Chat19.chat(player, message);
+        }
+
+        return isCommand;
+    }
+
+    public static void sendChat(ChatSender sender, Stream<ChatSender> receivers, String format, ChatSender msgReceiver, String message) {
         SteamwarUser user = sender.user();
+        final String coloredMessage = (user.getUserGroup() != UserGroup.Member || coloredTeams.contains(user.getTeam())) ? ChatColor.translateAlternateColorCodes('&', message) : message;
+        if(chatFilter(sender, coloredMessage))
+            return;
 
         AtomicBoolean noReceiver = new AtomicBoolean(true);
         receivers.filter(ChatSender::chatShown).forEach(player -> {
             if(sender.user().getId() != player.user().getId())
                 noReceiver.set(false);
-            chatToReciever(player, msgReceiver, user, format, finalMessage);
+            chatToReciever(player, msgReceiver, user, format, coloredMessage);
         });
 
-        chatToReciever(ChatSender.console(), msgReceiver, user, format, finalMessage);
+        chatToReciever(ChatSender.console(), msgReceiver, user, format, coloredMessage);
 
         if(format.equals("CHAT_GLOBAL")) {
             if (SteamwarDiscordBot.instance() != null)
-                chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getIngameChatListener()), msgReceiver, user, format, finalMessage);
+                chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getIngameChatListener()), msgReceiver, user, format, coloredMessage);
         } else if (format.equals("CHAT_SERVERTEAM")) {
             if (SteamwarDiscordBot.instance() != null)
-                chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getServerTeamChatListener()), msgReceiver, user, format, finalMessage);
+                chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getServerTeamChatListener()), msgReceiver, user, format, coloredMessage);
         } else if (noReceiver.get()) {
             sender.system("CHAT_NO_RECEIVER");
         }
@@ -115,44 +126,42 @@ public class ChatListener extends BasicListener {
             return;
         }
 
-        message = sanitize7(message);
-
         if(ChatListener.filteredCommand(player, message))
             return;
-        if(!message.startsWith("/")) {
+
-            message = modifyFilter(sender, message);
+        if(!message.startsWith("/") && chatFilter(sender, message))
-            if(message == null)
+            return;
-                return;
-        }
 
         Chat19.chat(player, message);
     }
 
-    private static String modifyFilter(ChatSender sender, String message) {
+    private static boolean chatFilter(ChatSender sender, String message) {
         if(!sender.chatShown()) {
             sender.system("CHAT_RECEIVE");
-            return null;
+            return true;
+        }
+
+        if(message.replace("§[a-f0-9klmno]", "").trim().isEmpty()) {
+            sender.system("CHAT_EMPTY");
+            return true;
         }
 
         SteamwarUser user = sender.user();
         UserGroup group = user.getUserGroup();
         if(!group.isTeamGroup() && (message.contains("http:") || message.contains("https:") || message.contains("www."))){
             sender.system("CHAT_NO_LINKS");
-            return null;
+            return true;
         }
 
         if (user.isPunishedWithMessage(sender, Punishment.PunishmentType.Mute))
-            return null;
+            return true;
-
-        if(group != UserGroup.Member || coloredTeams.contains(user.getTeam()))
-            message = ChatColor.translateAlternateColorCodes('&', message);
 
         if (message.contains("LIXFEL"))
             specialAlert(sender, "Lixfel", "CHAT_LIXFEL_", 3, 6, 11, 12, 15);
         if (message.contains("YOYONOW"))
             specialAlert(sender, "YoyoNow", "CHAT_YOYONOW_", 3, 6, 11, 12);
 
-        return message;
+        return false;
     }
 
     private static void chatToReciever(ChatSender receiver, ChatSender msgReceiver, SteamwarUser sender, String format, String message) {
@@ -168,17 +177,6 @@ public class ChatListener extends BasicListener {
                 group.getChatColorCode()));
     }
 
-    private static String sanitize7(String message) {
-        String begin = message.split(" ", 2)[0];
-        if(begin.startsWith("7") && begin.substring(1).matches("[A-Za-z]+")){
-            message = "/" + message.substring(1);
-        }else if((begin.startsWith("77") || begin.startsWith("7/") || begin.startsWith("/7")) && begin.substring(2).matches("[A-Za-z]+")){
-            message = "//" + message.substring(2);
-        }
-
-        return message;
-    }
-
     private static boolean filteredCommand(CommandSender sender, String message) {
         String command = message.split(" ", 2)[0];
         if(command.startsWith("/") && command.contains(":")) {

src/de/steamwar/bungeecore/listeners/ConnectionListener.java

@@ -105,6 +105,9 @@ public class ConnectionListener extends BasicListener {
     @EventHandler
     public void onServerKickEvent(ServerKickEvent ev)
     {
+        if(!ev.getPlayer().isConnected())
+            return;
+
         ServerInfo kickedFrom;
 
         if (ev.getPlayer().getServer() != null){

src/de/steamwar/bungeecore/sql/Statement.java

@@ -44,7 +44,7 @@ public class Statement implements AutoCloseable {
     private static final String PASSWORD;
 
     static {
-        File file = new File(BungeeCore.get().getDataFolder(), "MySQL.yml");
+        File file = new File(System.getProperty("user.home"), "MySQL.yml");
         Configuration config;
         try {
             config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file);

src/de/steamwar/bungeecore/sql/SteamwarUser.java

@@ -22,7 +22,7 @@ package de.steamwar.bungeecore.sql;
 import com.google.gson.JsonParser;
 import de.steamwar.bungeecore.BungeeCore;
 import de.steamwar.bungeecore.Message;
-import de.steamwar.bungeecore.commands.WebregisterCommand;
+import de.steamwar.bungeecore.commands.WebpasswordCommand;
 import de.steamwar.bungeecore.listeners.ConnectionListener;
 import de.steamwar.bungeecore.network.NetworkSender;
 import de.steamwar.messages.ChatSender;
@@ -121,7 +121,7 @@ public class SteamwarUser {
             String userName = connection.getName();
             if (!user.userName.equals(userName)) {
                 updateName.update(userName, user.id);
-                WebregisterCommand.changeUsername(user.userName, userName);
+                WebpasswordCommand.changeUsername(user.userName, userName);
                 user.userName = userName;
             }
         } else {

src/de/steamwar/bungeecore/tablist/Tablist.java

@@ -62,7 +62,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
         this.player = player;
         this.viewer = ChatSender.of(player);
         this.directTabItems = Storage.directTabItems.computeIfAbsent(player, p -> new HashMap<>());
-        onServerSwitch();
+        injection();
     }
 
     public void update(TablistPart global, int seconds) {
@@ -145,12 +145,17 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
     }
 
     public void onServerSwitch() {
-        connection = (ServerConnection) player.getServer();
+        injection();
+
         synchronized (directTabItems) {
             sendNpcPacket(npcs.stream().map(npc -> directTabItems.get(npc).getUsername()).collect(Collectors.toList()), true);
             directTabItems.clear();
             npcs.clear();
         }
+    }
+
+    private void injection() {
+        connection = (ServerConnection) player.getServer();
 
         if(connection != null) {
             ChannelPipeline pipeline = connection.getCh().getHandle().pipeline();
@@ -205,6 +210,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                         for (PlayerListItem.Item item : list.getItems()) {
                             item.setPing(1);
                             item.setDisplayName(ComponentSerializer.toString(TextComponent.fromLegacyText("")));
+                            item.setPublicKey(null);
                             if(!player.getUniqueId().equals(item.getUuid()) && item.getGamemode() == 3)
                                 item.setGamemode(1);
 

src/de/steamwar/bungeecore/tablist/TablistManager.java

@@ -51,7 +51,9 @@ public class TablistManager extends BasicListener {
 
     public TablistManager() {
         ProxyServer.getInstance().getScheduler().schedule(BungeeCore.get(), this::updateTablist, 1, 1, TimeUnit.SECONDS);
-        ProxyServer.getInstance().getPlayers().forEach(player -> tablists.put(player, new Tablist(player)));
+        synchronized (tablists) {
+            ProxyServer.getInstance().getPlayers().forEach(player -> tablists.put(player, new Tablist(player)));
+        }
     }
 
     @EventHandler

src/de/steamwar/bungeecore/util/Chat19.java

@@ -19,49 +19,26 @@
 
 package de.steamwar.bungeecore.util;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import net.md_5.bungee.ServerConnection;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.protocol.PacketWrapper;
+import net.md_5.bungee.protocol.ChatChain;
-import net.md_5.bungee.protocol.ProtocolConstants;
+import net.md_5.bungee.protocol.packet.ClientChat;
-import net.md_5.bungee.protocol.packet.Chat;
+import net.md_5.bungee.protocol.packet.ClientCommand;
 
-import java.time.Instant;
+import java.util.Collections;
 
-public class Chat19 extends Chat {
+public class Chat19 {
+    private Chat19(){}
 
     public static void chat(ProxiedPlayer p, String message) {
         if(p.getPendingConnection().getVersion() >= 759) {
-            Chat19 packet = new Chat19(message);
+            if(message.startsWith("/")) {
-
+                ((ServerConnection) p.getServer()).getCh().write(new ClientCommand(message.substring(1), System.currentTimeMillis(), 0, Collections.emptyMap(), false, new ChatChain(Collections.emptyList(), null)));
-            ByteBuf buf = Unpooled.buffer();
+            } else {
-            writeVarInt(0x04, buf);
+                ((ServerConnection) p.getServer()).getCh().write(new ClientChat(message, System.currentTimeMillis(), 0, new byte[0], false, new ChatChain(Collections.emptyList(), null)));
-            packet.write(buf, ProtocolConstants.Direction.TO_SERVER, p.getPendingConnection().getVersion());
+            }
-            ((ServerConnection) p.getServer()).getCh().write(new PacketWrapper(packet, buf));
         } else {
             p.chat(message);
         }
     }
-
-    private final Instant timestamp = Instant.now();
-    private final long salt = 0L;
-    private final byte[] signature = new byte[0];
-    private final boolean signedPreview = false;
-
-    public Chat19 (String message) {
-        super(message);
-    }
-
-    @Override
-    public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
-        if (direction == ProtocolConstants.Direction.TO_CLIENT || protocolVersion != 759)
-            throw new UnsupportedOperationException();
-
-        writeString(getMessage(), buf);
-        buf.writeLong(timestamp.toEpochMilli());
-        buf.writeLong(salt);
-        writeArray(signature, buf);
-        buf.writeBoolean(signedPreview);
-    }
 }

src/de/steamwar/command/GuardChecker.java

@@ -1,30 +0,0 @@
-/*
- * 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 <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.command;
-
-import net.md_5.bungee.api.CommandSender;
-
-@FunctionalInterface
-public interface GuardChecker extends AbstractGuardChecker<CommandSender> {
-    /**
-     * While guarding the first parameter of the command the parameter s of this method is {@code null}
-     */
-    GuardResult guard(CommandSender commandSender, GuardCheckType guardCheckType, String[] previousArguments, String s);
-}

src/de/steamwar/command/SWCommand.java

@@ -149,7 +149,7 @@ public class SWCommand extends AbstractSWCommand<CommandSender> {
         }
         if (args.length == 0 || atomicInteger.get() == commandList.size()) {
             commandList.forEach(subCommand -> {
-                if (subCommand.guardChecker == null || subCommand.guardChecker.guard(p, GuardCheckType.TAB_COMPLETE, new String[0], null) == GuardResult.ALLOWED) {
+                if (subCommand.validator == null || subCommand.validator.validate(p, p, (s, args1) -> {})) {
                     send(chatSender, subCommand);
                 }
             });

src/de/steamwar/messages/BungeeCore.properties

@@ -20,7 +20,7 @@ DISABLED=§cCurrently disabled.
 
 #ModLoader blocker
 MODLOADER_INSTALLED=§7You play with §e{0} §7client. Therefore you can't join arenas.
-MODLOADER_INSTALLED_FABRIC=§7You play with §e{0} §7client. You can only join arenas with the SteamWar Modsender installed.
+MODLOADER_INSTALLED_FABRIC=§7You play with §e{0} §7client. You can join arenas only with the FabricModSender https://steamwar.de/downloads installed.
 MODLOADER_DENIED=§cYou cannot join arenas with Fabric and LiteLoader.
 
 #Help command
@@ -498,13 +498,10 @@ UNIGNORE_NOT_IGNORED=§cYou are not ignoring this player.
 UNIGNORE_UNIGNORED=§7You ignored §e{0}§8.
 
 #WebregisterCommand
-WEB_USAGE=§8/§7webregister §8[§eE-Mail§8]
+WEB_USAGE=§8/§7webpassword §8[§epassword§8]
-WEB_ALREADY=§cYou already have a webaccount.
+WEB_UPDATED=§7Your password was updated.
-WEB_ALREADY_EMAIL=§cYou already used this E-Mail address on another account...
+WEB_CREATED=§7Your webaccount was created.
-WEB_NOT_EMAIL=§c[E-Mail], not [free text]!
+WEB_PASSWORD_LENGTH=§cYour password is shorter than 8 characters.
-WEB_EMAIL_REFRESH=§aYour E-Mail was updated.
-WEB_INTERNAL_ERROR=§cAn internal error occurred, please contact a developer.
-WEB_EMAIL_SEND=§aAn E-Mail to reset your password has been sent.
 
 #ChatListener
 CHAT_LIXFEL_ACTION_BAR=§4§lTechnical problems?
@@ -521,6 +518,7 @@ CHAT_RECEIVE=§cTo be able to send chat messages, you must also receive them!
 CHAT_NO_LINKS=§cYou may not send links.
 CHAT_BC_USAGE=§8/§7bc §8[§emessage§8]
 CHAT_NO_RECEIVER=§cNobody receives your message
+CHAT_EMPTY=§cDon't write meaningless empty messages.
 
 CHAT_SERVERTEAM=§8STC §e{0}§8» §f{2}
 CHAT_GLOBAL={3}{4}{5}{6}{0}§8» {7}{2}

src/de/steamwar/messages/BungeeCore_de.properties

@@ -16,7 +16,7 @@ DISABLED=§cDerzeit deaktiviert.
 
 #ModLoader blocker
 MODLOADER_INSTALLED=§7Du spielst mit §e{0} §7Client. Daher kannst du keinen Arenen beitreten.
-MODLOADER_INSTALLED_FABRIC=§7Du spielst mit §e{0} §7Client. Nur mit dem SteamWarModSender kannst du Arenen beitreten.
+MODLOADER_INSTALLED_FABRIC=§7Du spielst mit §e{0} §7Client. Nur mit dem FabricModSender https://steamwar.de/downloads kannst du Arenen beitreten.
 MODLOADER_DENIED=§cMit Fabric und LiteLoader kannst du keinen Arenen beitreten.
 
 #Help command
@@ -477,13 +477,10 @@ UNIGNORE_NOT_IGNORED=§cDu ignorierst diesen Spieler nicht.
 UNIGNORE_UNIGNORED=§7Du empfängst nun wieder Nachrichten von §e{0}§8.
 
 #WebregisterCommand
-WEB_USAGE=§8/§7webregister §8[§eE-Mail§8]
+WEB_USAGE=§8/§7webpassword §8[§ePasswort§8]
-WEB_ALREADY=§cDu hast bereits einen Webaccount.
+WEB_UPDATED=§7Dein Passwort wurde aktualisiert.
-WEB_ALREADY_EMAIL=§cDie E-Mail hast du bereits für einen anderen Account verwendet...
+WEB_CREATED=§7Dein Webaccount wurde erstellt.
-WEB_NOT_EMAIL=§c[E-Mail], nicht [Freitext]!
+WEB_PASSWORD_LENGTH=§cDein Passwort ist kürzer als 8 Zeichen.
-WEB_EMAIL_REFRESH=§aDeine E-Mail-Adresse wurde aktualisiert.
-WEB_INTERNAL_ERROR=§cEin interner Fehler ist aufgetreten, bitte wende dich an einen Developer.
-WEB_EMAIL_SEND=§aEine E-Mail zum Setzen des Passworts wurde gesendet.
 
 #ChatListener
 CHAT_LIXFEL_ACTION_BAR=§4§lTechnische Probleme?
@@ -500,6 +497,7 @@ CHAT_RECEIVE=§cUm Chatnachrichten versenden zu können, musst du auch welche em
 CHAT_NO_LINKS=§cDu darfst keine Links versenden.
 CHAT_BC_USAGE=§8/§7bc §8[§eNachricht§8]
 CHAT_NO_RECEIVER=§cNiemand empfängt deine Nachricht
+CHAT_EMPTY=§cSchreibe keine inhaltslosen Nachrichten.
 
 CHAT_SERVERTEAM=§8STC §e{0}§8» §f{2}
 CHAT_GLOBAL={3}{4}{5}{6}{0}§8» {7}{2}