From 2746a4383780770f03d4a96417505d21f714dcac Mon Sep 17 00:00:00 2001
From: akastijn <akastijn@alttd.com>
Date: Sun, 24 May 2026 17:04:50 +0200
Subject: [PATCH] Add player join and disconnect event handling with state
 updates

---
 .idea/gradle.xml                              |  1 +
 .../java/com/alttd/hunger_games/Main.java     |  4 ++++
 .../alttd/hunger_games/config/Messages.java   | 11 +++++++++++
 .../PlayerDisconnectListener.java             | 18 ++++++++++++++++++
 .../event_listeners/PlayerJoinListener.java   | 18 ++++++++++++++++++
 .../hunger_games/services/PlayerService.java  | 19 +++++++++++++++++++
 .../hunger_games/services/RoundService.java   |  1 -
 7 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/alttd/hunger_games/event_listeners/PlayerDisconnectListener.java
 create mode 100644 src/main/java/com/alttd/hunger_games/event_listeners/PlayerJoinListener.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f9163b4..ce1c62c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/src/main/java/com/alttd/hunger_games/Main.java b/src/main/java/com/alttd/hunger_games/Main.java
index eabaed3..e7373cd 100644
--- a/src/main/java/com/alttd/hunger_games/Main.java
+++ b/src/main/java/com/alttd/hunger_games/Main.java
@@ -3,6 +3,8 @@ package com.alttd.hunger_games;
 import com.alttd.hunger_games.commands.BaseCommand;
 import com.alttd.hunger_games.config.Config;
 import com.alttd.hunger_games.config.Messages;
+import com.alttd.hunger_games.event_listeners.PlayerDisconnectListener;
+import com.alttd.hunger_games.event_listeners.PlayerJoinListener;
 import com.alttd.hunger_games.services.PlayerService;
 import com.alttd.hunger_games.services.Round;
 import com.alttd.hunger_games.services.RoundService;
@@ -43,6 +45,8 @@ public final class Main extends JavaPlugin {
 
     private void registerEvents() {
         PluginManager pluginManager = getServer().getPluginManager();
+        pluginManager.registerEvents(new PlayerDisconnectListener(playerService), this);
+        pluginManager.registerEvents(new PlayerJoinListener(playerService), this);
     }
 
     public void reloadConfigs() {
diff --git a/src/main/java/com/alttd/hunger_games/config/Messages.java b/src/main/java/com/alttd/hunger_games/config/Messages.java
index c81048f..7a07c68 100644
--- a/src/main/java/com/alttd/hunger_games/config/Messages.java
+++ b/src/main/java/com/alttd/hunger_games/config/Messages.java
@@ -66,6 +66,17 @@ public class Messages extends AbstractConfig {
         }
     }
 
+    public static class RECONNECT {
+        private static final String prefix = "reconnect.";
+
+        public static String FORFEITED = "<red>You disconnected during the round and have forfeited the game. You are now spectating.</red>";
+
+        @SuppressWarnings("unused")
+        private static void load() {
+            FORFEITED = config.getString(prefix, "forfeited", FORFEITED);
+        }
+    }
+
     public static class REGISTER {
         private static final String prefix = "register.";
 
diff --git a/src/main/java/com/alttd/hunger_games/event_listeners/PlayerDisconnectListener.java b/src/main/java/com/alttd/hunger_games/event_listeners/PlayerDisconnectListener.java
new file mode 100644
index 0000000..988774b
--- /dev/null
+++ b/src/main/java/com/alttd/hunger_games/event_listeners/PlayerDisconnectListener.java
@@ -0,0 +1,18 @@
+package com.alttd.hunger_games.event_listeners;
+
+import com.alttd.hunger_games.services.PlayerService;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+@RequiredArgsConstructor
+public class PlayerDisconnectListener implements Listener {
+
+    private final PlayerService playerService;
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        playerService.handleDisconnect(event.getPlayer());
+    }
+}
diff --git a/src/main/java/com/alttd/hunger_games/event_listeners/PlayerJoinListener.java b/src/main/java/com/alttd/hunger_games/event_listeners/PlayerJoinListener.java
new file mode 100644
index 0000000..9cd526c
--- /dev/null
+++ b/src/main/java/com/alttd/hunger_games/event_listeners/PlayerJoinListener.java
@@ -0,0 +1,18 @@
+package com.alttd.hunger_games.event_listeners;
+
+import com.alttd.hunger_games.services.PlayerService;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+@RequiredArgsConstructor
+public class PlayerJoinListener implements Listener {
+
+    private final PlayerService playerService;
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        playerService.handleJoin(event.getPlayer());
+    }
+}
diff --git a/src/main/java/com/alttd/hunger_games/services/PlayerService.java b/src/main/java/com/alttd/hunger_games/services/PlayerService.java
index 9180938..cb4a637 100644
--- a/src/main/java/com/alttd/hunger_games/services/PlayerService.java
+++ b/src/main/java/com/alttd/hunger_games/services/PlayerService.java
@@ -1,5 +1,6 @@
 package com.alttd.hunger_games.services;
 
+import com.alttd.hunger_games.config.Messages;
 import com.alttd.hunger_games.data_objects.PLAYER_STATE;
 import com.alttd.hunger_games.data_objects.ROUND_STATE;
 import lombok.RequiredArgsConstructor;
@@ -60,6 +61,24 @@ public class PlayerService implements RoundListener {
         return optionalPlayerState;
     }
 
+    public void handleDisconnect(Player player) {
+        UUID uuid = player.getUniqueId();
+        roundService.setPlayerState(uuid, PLAYER_STATE.DISCONNECTED);
+    }
+
+    public void handleJoin(Player player) {
+        UUID uuid = player.getUniqueId();
+        Optional<PLAYER_STATE> state = roundService.getPlayerState(uuid);
+        if (state.isEmpty()) {
+            return;
+        }
+        if (state.get() != PLAYER_STATE.DISCONNECTED) {
+            return;
+        }
+        roundService.setPlayerState(uuid, PLAYER_STATE.SPECTATING);
+        player.sendRichMessage(Messages.RECONNECT.FORFEITED);
+    }
+
     private Optional<PLAYER_STATE> determinePlayerState(UUID playerUuid) {
         if (roundState == null) {
             return Optional.empty();
diff --git a/src/main/java/com/alttd/hunger_games/services/RoundService.java b/src/main/java/com/alttd/hunger_games/services/RoundService.java
index a5cc05b..48d277e 100644
--- a/src/main/java/com/alttd/hunger_games/services/RoundService.java
+++ b/src/main/java/com/alttd/hunger_games/services/RoundService.java
@@ -3,7 +3,6 @@ package com.alttd.hunger_games.services;
 import com.alttd.hunger_games.data_objects.PLAYER_STATE;
 import com.alttd.hunger_games.data_objects.ROUND_STATE;
 import lombok.Getter;
-import org.bukkit.entity.Player;
 
 import java.util.*;
 import java.util.stream.Collectors;