Merge branch 'master' into sql

CommonCore

@@ -1 +1 @@
-Subproject commit 0f03b57e437c1d843816b7202d95b79ff0a8d2df
+Subproject commit 919c4d525ea39756b24bd961bb72d8d58bdd5bd4

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

@@ -103,6 +103,9 @@ public class WhoisCommand extends BasicCommand {
             if (!all && !punishment.getType().isMulti() && !found.add(punishment.getType())) {
                 continue;
             }
+            if (!all && !punishment.isCurrent()) {
+                continue;
+            }
             Message.sendPrefixless("WHOIS_PUNISHMENT", player, SteamwarUser.get(punishment.getPunisher()).getUserName(), punishment.getType().name(), punishment.getBantime(punishment.getStartTime(), false), punishment.getBantime(punishment.getEndTime(), punishment.isPerma()), punishment.getReason());
             isPunished = true;
         }