From edfbfb614d8e73abec1397da0c972627538b7734 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 3 Jun 2022 13:24:47 +0200 Subject: [PATCH 1/2] Hotfix WhoisCommand --- CommonCore | 2 +- src/de/steamwar/bungeecore/commands/WhoisCommand.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index 0f03b57..919c4d5 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit 0f03b57e437c1d843816b7202d95b79ff0a8d2df +Subproject commit 919c4d525ea39756b24bd961bb72d8d58bdd5bd4 diff --git a/src/de/steamwar/bungeecore/commands/WhoisCommand.java b/src/de/steamwar/bungeecore/commands/WhoisCommand.java index da6a631..0f827cb 100644 --- a/src/de/steamwar/bungeecore/commands/WhoisCommand.java +++ b/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 (!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; } From d4e2e80dd5cb03cdbf155c3ca703cf0fd36adc29 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 3 Jun 2022 13:26:03 +0200 Subject: [PATCH 2/2] Hotfix WhoisCommand --- src/de/steamwar/bungeecore/commands/WhoisCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/commands/WhoisCommand.java b/src/de/steamwar/bungeecore/commands/WhoisCommand.java index 0f827cb..1303059 100644 --- a/src/de/steamwar/bungeecore/commands/WhoisCommand.java +++ b/src/de/steamwar/bungeecore/commands/WhoisCommand.java @@ -103,7 +103,7 @@ public class WhoisCommand extends BasicCommand { if (!all && !punishment.getType().isMulti() && !found.add(punishment.getType())) { continue; } - if (!punishment.isCurrent()) { + 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());