SteamWar/BungeeCore
Archiviert
13
2

Merge pull request 'Fix WhoisCommand' (#289) from active_punishments into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #289
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Dieser Commit ist enthalten in:
Lixfel 2021-12-31 13:34:52 +01:00
Commit 77a4bfb970

Datei anzeigen

@ -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()); 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 { } else {
boolean isPunished = false;
for (Punishment.PunishmentType punishmentType : Punishment.PunishmentType.values()) { for (Punishment.PunishmentType punishmentType : Punishment.PunishmentType.values()) {
if(user.isPunished(punishmentType)) { if(!user.isPunished(punishmentType)) {
Message.send("WHOIS_NO_PUNISHMENT", player);
continue; continue;
} }
Punishment punishment = user.getPunishment(punishmentType); 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()); 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);
}
} }
} }
} }