From 27e01a56ae22856f35b090ccb79d2b35abe78b8a Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 17 Jun 2026 11:09:32 +0200
Subject: [PATCH] Improve CheckCommand

---
 .../velocitycore/commands/CheckCommand.java   | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 26eac997..f96c0b56 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -90,11 +90,7 @@ public class CheckCommand extends SWCommand {
         for (SchematicNode schematicNode : getSchemsToCheck()) {
             if (!mayCheck(user, schematicNode)) continue;
             CheckSession checkSession = currentSchems.get(schematicNode.getId());
-            if (checkSession == null) {
-                map.put(schematicNode, null);
-            } else {
-                map.put(schematicNode, checkSession.checker.user());
-            }
+            map.put(schematicNode, checkSession == null ? null : checkSession.checker.user());
         }
         return map;
     }
@@ -112,7 +108,6 @@ public class CheckCommand extends SWCommand {
         if (schematics.isEmpty()) return;
         long needsChecking = schematics.entrySet().stream().filter(entry -> entry.getValue() == null).count();
         if (needsChecking == 0) return;
-
         chatter.system("CHECK_REMINDER", new Message("CHECK_REMINDER_HOVER"), ClickEvent.runCommand("/check list"), needsChecking);
     }
 
@@ -123,29 +118,30 @@ public class CheckCommand extends SWCommand {
         sender.system("CHECK_LIST_HEADER", schematics.size());
 
         for (Map.Entry<SchematicNode, SteamwarUser> entry : schematics.entrySet()) {
+            String message;
             ClickEvent clickEvent;
             Message hoverMessage;
+            String checker;
             if (entry.getValue() == null) {
+                message = "CHECK_LIST_TO_CHECK";
                 clickEvent = ClickEvent.runCommand("/check schematic " + entry.getKey().getId());
                 hoverMessage = new Message("CHECK_LIST_TO_CHECK_HOVER");
+                checker = "";
             } else {
+                message = "CHECK_LIST_CHECKING";
                 clickEvent = ClickEvent.runCommand("/join " + entry.getValue().getUserName());
                 hoverMessage = new Message("CHECK_LIST_CHECKING_HOVER");
+                checker = entry.getValue().getUserName();
             }
 
-            if (entry.getValue() == null) {
-                sender.prefixless("CHECK_LIST_TO_CHECK",
-                        hoverMessage,
-                        clickEvent,
-                        getWaitTime(entry.getKey()),
-                        entry.getKey().getSchemtype().getKuerzel(), SteamwarUser.byId(entry.getKey().getOwner()).getUserName(), entry.getKey().getName());
-            } else {
-                sender.prefixless("CHECK_LIST_CHECKING",
-                        hoverMessage,
-                        clickEvent,
-                        getWaitTime(entry.getKey()),
-                        entry.getKey().getSchemtype().getKuerzel(), SteamwarUser.byId(entry.getKey().getOwner()).getUserName(), entry.getKey().getName(), entry.getValue().getUserName());
-            }
+            sender.prefixless(message,
+                    hoverMessage,
+                    clickEvent,
+                    getWaitTime(entry.getKey()),
+                    entry.getKey().getSchemtype().getKuerzel(),
+                    SteamwarUser.byId(entry.getKey().getOwner()).getUserName(),
+                    entry.getKey().getName(),
+                    checker);
         }
     }
 
@@ -237,11 +233,6 @@ public class CheckCommand extends SWCommand {
         return schematicList;
     }
 
-    public static String getChecker(SchematicNode schematic) {
-        if (currentSchems.get(schematic.getId()) == null) return null;
-        return currentSchems.get(schematic.getId()).checker.user().getUserName();
-    }
-
     private static boolean notChecking(Player player) {
         if (!isChecking(player)) {
             Chatter.of(player).system("CHECK_NOT_CHECKING");