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

@@ -104,14 +104,18 @@ public class WhoisCommand extends BasicCommand {
                 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());
             }
         } else {
+            boolean isPunished = false;
             for (Punishment.PunishmentType punishmentType : Punishment.PunishmentType.values()) {
-                if(user.isPunished(punishmentType)) {
-                    Message.send("WHOIS_NO_PUNISHMENT", player);
+                if(!user.isPunished(punishmentType)) {
                     continue;
                 }
                 Punishment punishment = user.getPunishment(punishmentType);
+                isPunished = true;
                 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());
             }
+            if(!isPunished) {
+                Message.send("WHOIS_NO_PUNISHMENT", player);
+            }
         }
     }
 }