From 4bf6ca9dc49f4db95fc18238be1feb56d22b5714 Mon Sep 17 00:00:00 2001
From: akastijn <akastijn@alttd.com>
Date: Mon, 22 Jun 2026 02:26:37 +0200
Subject: [PATCH] Improve `RoundState` command to handle null `ROUND_STATE`
 values gracefully

---
 .../alttd/hunger_games/commands/subcommands/RoundState.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alttd/hunger_games/commands/subcommands/RoundState.java b/src/main/java/com/alttd/hunger_games/commands/subcommands/RoundState.java
index b36422b..495baa5 100644
--- a/src/main/java/com/alttd/hunger_games/commands/subcommands/RoundState.java
+++ b/src/main/java/com/alttd/hunger_games/commands/subcommands/RoundState.java
@@ -2,6 +2,7 @@ package com.alttd.hunger_games.commands.subcommands;
 
 import com.alttd.hunger_games.commands.SubCommand;
 import com.alttd.hunger_games.config.Messages;
+import com.alttd.hunger_games.data_objects.ROUND_STATE;
 import com.alttd.hunger_games.services.RoundService;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -16,9 +17,10 @@ public class RoundState extends SubCommand {
 
     @Override
     public boolean onCommand(CommandSender commandSender, String[] args) {
+        ROUND_STATE roundState = roundService.getRoundState();
         commandSender.sendRichMessage(Messages.ROUND_STATE.ROUND_STATE,
                                       Placeholder.parsed("round_state",
-                                                         roundService.getRoundState().getHumandReadableName()));
+                                              roundState == null ? "null" : roundState.getHumandReadableName()));
         return true;
     }