@@ -56,7 +56,8 @@ public class BanCommand extends BasicCommand {
         }
         String msg = banReason.toString();
         BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gebannt. Grund: §c" + msg);

@@ -58,2 +58,3 @@
         BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gebannt. Grund: §c" + msg);
-        target.ban(banTime, msg);
+        ServerTeamchatCommand.sendToTeam(BungeeCore.CHAT_PREFIX + "§c" + target.getUserName() + " wurde von " + sender.getName() + " " + (args[1].equalsIgnoreCase("perma")?"Permanent":"bis zum " + banTime.toLocalDateTime().format(BungeeCore.DATE_FORMAT)) + " gebannt. §f§lGrund: §f" + banReason);
+        target.ban(banTime, msg, SteamwarUser.get(sender.getName()).getId(), args[1].equalsIgnoreCase("perma"));

@@ -52,3 +52,4 @@
         }
         String msg = muteReason.toString();
+        ServerTeamchatCommand.sendToTeam(BungeeCore.CHAT_PREFIX + "§c" + target.getUserName() + " wurde von " + sender.getName() + " " + (args[1].equalsIgnoreCase("perma")?"Permanent":"bis zum " + muteTime.toLocalDateTime().format(BungeeCore.DATE_FORMAT)) + " gemuted. §f§lGrund: §f" + muteReason);
         BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gemuted. Grund: §c" + msg);

@@ -54,2 +54,3 @@
+        ServerTeamchatCommand.sendToTeam(BungeeCore.CHAT_PREFIX + "§c" + target.getUserName() + " wurde von " + sender.getName() + " " + (args[1].equalsIgnoreCase("perma")?"Permanent":"bis zum " + muteTime.toLocalDateTime().format(BungeeCore.DATE_FORMAT)) + " gemuted. §f§lGrund: §f" + muteReason);
         BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gemuted. Grund: §c" + msg);
-        target.mute(muteTime, msg);
+        target.mute(muteTime, msg, SteamwarUser.get(sender.getName()).getId(), args[1].equalsIgnoreCase("perma"));

@@ -75,3 +74,1 @@
-        }
-        if(user.isMuted()){
-            player.sendMessage(user.muteMessage());
+        BungeeCore.send(player, "§7Bestrafungen: ");

@@ -50,0 +55,4 @@
+                ips.removeIf(bannedUserIPs -> bannedUserIPs.getUserID() == user.getId());
+                if(ips.isEmpty())
+                    return;
+            }

@@ -0,0 +28,4 @@
+public class Punishment {
+
+    public static Punishment getPunishmentByPlayer(int user, PunishmentType type) {
+        ResultSet set = SQL.select("SELECT * FROM `Punishments` WHERE `PunishmentId` IN (SELECT MAX(`PunishmentId`) FROM Punishments WHERE UserId = ? AND Type = ?)", user, type.toDb());

@@ -0,0 +34,4 @@
+                return null;
+            return new Punishment(set);
+        } catch (SQLException throwable) {
+            throwable.printStackTrace();

@@ -0,0 +40,4 @@
+    }
+
+    public static Map<PunishmentType, Punishment> getPunishmentsByPlayer(int user) {
+        ResultSet set = SQL.select("SELECT * FROM `Punishments` WHERE `PunishmentId` IN (SELECT MAX(`PunishmentId`) FROM Punishments WHERE UserId = ? GROUP BY Type)", user);

@@ -0,0 +81,4 @@
+    private final String reason;
+    private final int id;
+    private final int punisher;
+    private final boolean perma;

@@ -0,0 +131,4 @@
+        Mute;
+
+        public String toDb() {
+            return name().toLowerCase();

@@ -0,0 +135,4 @@
+        }
+
+        public static PunishmentType getTypeFromDB(String str) {
+            return Arrays.stream(values()).filter(punishmentType -> punishmentType.name().equalsIgnoreCase(str)).collect(Collectors.toList()).get(0);

@@ -169,2 +152,2 @@
-            return false;
-        }
+        return punishments.containsKey(Punishment.PunishmentType.Ban) &&
+                (punishments.get(Punishment.PunishmentType.Ban).getEndTime().after(new Date()) || punishments.get(Punishment.PunishmentType.Ban).isPerma());

@@ -223,2 +197,2 @@
-        muteTime = time;
-        this.muteReason = muteReason;
+    public void mute(Timestamp time, String muteReason, int from, boolean perma){
+        punishments.remove(Punishment.PunishmentType.Mute);

@@ -55,3 +55,3 @@
     public static final String SERVER_TEAMCHAT_PREFIX = "§8STC §e";
     public static final String TEAMCHAT_PREFIX = "§8TC §e";
-    public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd.MM.yyyy");
+    public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("HH:mm dd.MM.yyyy");

@@ -58,2 +58,2 @@
-        BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gebannt. Grund: §c" + msg);
-        target.ban(banTime, msg);
+        target.ban(banTime, msg, SteamwarUser.get(sender.getName()).getId(), args[1].equalsIgnoreCase("perma"));
+        ServerTeamchatCommand.sendToTeam(BungeeCore.CHAT_PREFIX + target.getUserGroup().getColorCode() + target.getUserName() + "§c wurde von " + SteamwarUser.get(sender.getName()).getUserGroup().getColorCode() + sender.getName() + " §c" + (args[1].equalsIgnoreCase("perma")?"Permanent":"bis zum " + banTime.toLocalDateTime().format(BungeeCore.DATE_FORMAT)) + " gebannt. §f§lGrund: §f" + banReason);

@@ -0,0 +63,4 @@
+        }
+    }
+
+    public static Punishment createPunishment(int user, int executor, PunishmentType type, String reason, Timestamp endTime, Boolean perma) {

@@ -163,3 +154,1 @@
-            return true;
-        } else {
-            SQL.update("UPDATE UserData SET BanTime = NULL, BanReason = '' WHERE id = ?", id);
+        if(!isCurrent(punishments.get(Punishment.PunishmentType.Ban))) {

@@ -224,1 +211,3 @@
-        this.muteReason = muteReason;
+    public void mute(Timestamp time, String muteReason, int from, boolean perma){
+        if(isMuted()) {
+            punishments.get(Punishment.PunishmentType.Ban).updateEndTime(from, muteReason, time, perma);

@@ -157,2 +150,4 @@
     }
 
+    public ProxiedPlayer getPlayer() {
+        return BungeeCore.get().getProxy().getPlayer(uuid);

@@ -78,0 +74,4 @@
+        BungeeCore.send(player, "§7Strafen: ");
+        for (Punishment punishment : Punishment.getAllPunishmentsOfPlayer(user.getId())) {
+            BungeeCore.send(player, "§7" + SteamwarUser.get(punishment.getPunisher()).getUserName() + "§8» §f§l" + punishment.getType().name() + ": §e"
+                    + punishment.getStartTime().toLocalDateTime().format(BungeeCore.DATE_FORMAT) + " - " + (punishment.isPerma()?"Perma":punishment.getEndTime().toLocalDateTime().format(BungeeCore.DATE_FORMAT)) + " §c" + punishment.getReason());

@@ -75,3 +75,3 @@
                 player.disconnect(BungeeCore.stringToText("§7Deaktiviere den Mod §e" + mods.get(0).getModName() + "§7, um weiter auf §eSteam§8War §7spielen zu können."));
             else{
-                user.ban(Timestamp.from(Instant.now().plus(7, ChronoUnit.DAYS)), "Versuchte Benutzung des Mods " + mods.get(0).getModName());
+                user.ban(Timestamp.from(Instant.now().plus(7, ChronoUnit.DAYS)), "Versuchte Benutzung des Mods " + mods.get(0).getModName(), 0, false);

@@ -85,3 +85,3 @@
                 player.disconnect(BungeeCore.stringToText("§7Deaktiviere die Mods\n§e" + sb.toString() + "§7um weiter auf §eSteam§8War §7spielen zu können."));
             else{
-                user.ban(Timestamp.from(Instant.now().plus(7, ChronoUnit.DAYS)), "Versuchte Benutzung der Mods\n" + sb.toString());
+                user.ban(Timestamp.from(Instant.now().plus(7, ChronoUnit.DAYS)), "Versuchte Benutzung der Mods\n" + sb.toString(), 0, false);

@@ -0,0 +43,4 @@
+    public static Map<PunishmentType, Punishment> getPunishmentsOfPlayer(int user) {
+        Map<PunishmentType, Punishment> punishmentMap = new HashMap<>();
+        for (PunishmentType type : PunishmentType.values()) {
+            Punishment punishment = getPunishmentOfPlayer(user, type);

@@ -184,0 +170,4 @@
+        return isCurrent(punishments.get(Punishment.PunishmentType.Mute));
+    }
+
+    private boolean isCurrent(Punishment punishment) {

@@ -189,3 +181,2 @@
         } else {
-            return BungeeCore.stringToText(BungeeCore.CHAT_PREFIX + " Du bist bis zum " +
-                    banTime.toLocalDateTime().format(BungeeCore.DATE_FORMAT) + " gebannt. §r§lGrund§r: §c" + banReason);
+            return BungeeCore.stringToText(Message.parsePrefixed("BANNED_MESSAGE_UNTIL", getPlayer(), punishment.getEndTime().toLocalDateTime().format(BungeeCore.DATE_FORMAT),

@@ -198,3 +191,2 @@
         } else {
-            return BungeeCore.stringToText(BungeeCore.CHAT_PREFIX + " Du bist bis zum " +
-                    muteTime.toLocalDateTime().format(BungeeCore.DATE_FORMAT) + " gemuted. §r§lGrund§r: §c" + muteReason);
+            return BungeeCore.stringToText(Message.parsePrefixed("MUTED_MESSAGE_UNTIL",getPlayer(), punishment.getEndTime().toLocalDateTime().format(BungeeCore.DATE_FORMAT), punishment.getReason()));

@@ -37,3 +38,2 @@
 
-    public static TextComponent parseToComponent(String message, boolean prefixed, CommandSender sender, Object... params){
-        return new TextComponent(TextComponent.fromLegacyText(parse(message, prefixed, sender, params)));
+    public static TextComponent parseToComponent(String message, boolean prefixed, CommandSender sender, int[] useFormatter, Object... params){

@@ -79,6 +93,10 @@ public class Message {
         send(message, false, sender, type, null, null, params);
     }
 
+    public static void sendPrefixless(String message, CommandSender sender, ChatMessageType type, int[] useFormatter, Object... params) {

@@ -88,3 +106,3 @@
     }
 
-    public static void send(String message, boolean prefixed, CommandSender sender, ChatMessageType type, String onHover, ClickEvent onClick, Object... params){
+    public static void send(String message, boolean prefixed, CommandSender sender, ChatMessageType type, String onHover, ClickEvent onClick, int[] useFormatter, Object... params){

@@ -124,3 +150,3 @@
     }
 
-    public static void team(String message, ChatMessageType type, Object... params){
+    public static void team(String message, ChatMessageType type, int[] useFormatter, Object... params){

@@ -58,2 +58,2 @@
-        Message.send("BAN_MESSAGE_YOU", sender, target.getUserName(), msg);
-        target.ban(banTime, msg);
+        target.ban(banTime, msg, SteamwarUser.get(sender.getName()).getId(), args[1].equalsIgnoreCase("perma"));
+        Message.team("BAN_TEAM_BANNED", new int[]{2}, target.getUserName(), sender.getName(), (args[1].equalsIgnoreCase("perma")?"BAN_PERMA":"BAN_UNTIL"), msg, banTime);

@@ -77,1 +76,3 @@
-            player.sendMessage(user.muteMessage());
+        BungeeCore.send(player, "§7Strafen: ");
+        for (Punishment punishment : Punishment.getAllPunishmentsOfPlayer(user.getId())) {
+            BungeeCore.send(player, "§7" + SteamwarUser.get(punishment.getPunisher()).getUserName() + "§8» §f§l" + punishment.getType().name() + ": §e"

@@ -0,0 +126,4 @@
+                getBantime(endTime, this.perma),
+                getBantime(newUpdate, perma),
+                newreason);
+        //TODO Add User

@@ -1,5 +1,6 @@
 PREFIX=§eSteam§8War»
 SPACER=
+TIMEFORMAT=dd.MM.yyyy HH:mm

@@ -97,0 +101,4 @@
+BANNED_MESSAGE_UNTIL=Du bist bis zum {0} gebannt. §r§lGrund§r: §c{1}
+MUTE_TEAM_MUTED=§c {0} wurde von {1} {2} gemuted. §f§lGrund: §f{3}
+MUTED_MESSAGE_PERMA=§cDu bist permanent gemuted. §r§lGrund§r: §c{0}
+MUTED_MESSAGE_UNTIL=Du bist bis zum {0} gemuted. §r§lGrund§r: §c{1}

@@ -45,3 +44,3 @@
             user.updateBanIP(event.getConnection().getAddress().getAddress().getHostAddress());
             event.setCancelled(true);
-            event.setCancelReason(user.banMessage());
+            event.setCancelReason(user.banMessage((ProxiedPlayer) event.getConnection()));

@@ -0,0 +46,4 @@
+        Map<PunishmentType, Punishment> punishments = new HashMap<>();
+        Punishment banPunishment = getPunishmentOfPlayer(user, PunishmentType.Ban);
+        if(banPunishment != null) punishments.put(PunishmentType.Ban, banPunishment);
+        Punishment mutePunishment = getPunishmentOfPlayer(user, PunishmentType.Mute);

@@ -156,48 +151,53 @@ public class SteamwarUser {
         return team;
     }
 
+    private void loadPunishments() {

@@ -184,0 +176,4 @@
+        return isCurrent(punishments.get(Punishment.PunishmentType.Mute));
+    }
+
+    private boolean isCurrent(Punishment punishment) {

@@ -248,2 +257,3 @@
         } catch (SQLException throwables) {
-            throwables.printStackTrace();
+            throw new SecurityException("Could not load Online Time", throwables);
+        } catch (NullPointerException e) { //When no Sessions are recorded

@@ -88,2 +89,4 @@
 HELP_BAU_TESTARENA=§8/§ebau testarena §8- §7Starte eine Testarena
 HELP_BAU_TESTARENA_HOVER=§eTestarena starten
+HELP_BAU_BAU=§8/§ehelp bau §8- §7Hilfe zu nützlichen Werkzeugen
+HELP_BAU_BAU_HOVER=§eNützliche Zusatzfunktionen

@@ -99,2 +108,3 @@
 
-BAN_MESSAGE_YOU=§7Du hast §e{0} §7gebannt§8. §7Grund§8: §c{1}
+#Ban&Mute-Command
+BAN_TEAM_BANNED=§8[§4☣§8]» §c{0} wurde von {1} {2} gebannt. §f§lGrund: §f{3}

@@ -101,0 +110,4 @@
+BAN_TEAM_BANNED=§8[§4☣§8]» §c{0} wurde von {1} {2} gebannt. §f§lGrund: §f{3}
+BANNED_MESSAGE_PERMA=§cDu bist permanent gebannt. §r§lGrund§r: §c{0}
+BANNED_MESSAGE_UNTIL=§cDu bist bis zum {0} gebannt. §r§lGrund§r: §c{1}
+MUTE_TEAM_MUTED=§8[§4☣§8]» §c{0} wurde von {1} {2} gemuted. §f§lGrund: §f{3}

@@ -101,0 +114,4 @@
+MUTED_MESSAGE_PERMA=§cDu bist permanent gemuted. §r§lGrund§r: §c{0}
+MUTED_MESSAGE_UNTIL=§cDu bist bis zum {0} gemuted. §r§lGrund§r: §c{1}
+BAN_CHANGED={0}verändert von {1} von {2} auf {3} wegen {4}
+BAN_PERMA=Permanent

@@ -149,1 +164,4 @@
+CHECK_DECLINED_TEAM=§7Die Schematic §e{0} §7von §e{1} §awurde aufgrund von §e{2} §7abgelehnt!
+
+#WhoisCommand

@@ -45,3 +44,3 @@
             user.updateBanIP(event.getConnection().getAddress().getAddress().getHostAddress());
             event.setCancelled(true);
-            event.setCancelReason(user.banMessage());
+            event.setCancelReason(user.banMessage(ProxyServer.getInstance().getPlayer(event.getConnection().getUniqueId())));