From 701a5ff620ec24c65d31a617856455de540f0095 Mon Sep 17 00:00:00 2001
From: kento2 <kento@placeq.com>
Date: Sun, 28 Jun 2026 21:41:13 +0200
Subject: [PATCH] fix: unable to leave regions when unloaded

---
 .idea/workspace.xml                           | 19 +++++++++++++------
 README.md                                     |  1 +
 .../scrow/bukkit/region/RegionManager.java    |  4 ++++
 .../bukkit/region/RegionManagerImpl.java      |  6 ++++++
 .../bukkit/region/RegionPlayerTracker.java    | 11 +++++++++++
 .../scrow/bukkit/region/RegionTask.java       | 19 ++++++++++++-------
 6 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a4fe9da..d949516 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment=".">
-      <change afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/event/RegionJoinEvent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -281,10 +280,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Gradle.core [build]" />
+        <item itemvalue="Gradle.core [publishAllPublicationsToScrowRepository]" />
         <item itemvalue="Gradle.core [clean]" />
         <item itemvalue="Gradle.core:core-bukkit-api [build]" />
         <item itemvalue="Gradle.core:core-bukkit-api [clean]" />
-        <item itemvalue="Gradle.core [publishAllPublicationsToScrowRepository]" />
       </list>
     </recent_temporary>
   </component>
@@ -304,7 +303,15 @@
       <option name="project" value="LOCAL" />
       <updated>1782666067624</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary=".">
+      <option name="closed" value="true" />
+      <created>1782673270039</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1782673270039</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">
diff --git a/README.md b/README.md
index 7127db9..c0ca189 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 TODO
 - cleanup nats
 - timeout/error handling with reactive
+- logging in general, log some exceptions to game chat
 - djb's multilogd for logging(?)
 
 environment
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java
index ed3ee25..8e9e2fc 100644
--- a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/region/RegionManager.java
@@ -1,12 +1,16 @@
 package de.kentoj.scrow.bukkit.region;
 
 import de.kentoj.scrow.bukkit.region.impl.Region;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.UUID;
 
 public interface RegionManager {
     List<Region> getRegions(ChunkPos chunkPos);
 
+    @Nullable Region getRegion(UUID regionUuid);
+
     void registerRegion(Region region);
 
     void unregisterRegion(Region region);
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java
index 189f956..9100b3e 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionManagerImpl.java
@@ -1,6 +1,7 @@
 package de.kentoj.scrow.bukkit.region;
 
 import de.kentoj.scrow.bukkit.region.impl.Region;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
@@ -17,6 +18,11 @@ public class RegionManagerImpl implements RegionManager {
         return uuids.stream().map(regions::get).toList();
     }
 
+    @Override
+    public @Nullable Region getRegion(UUID regionUuid) {
+        return regions.get(regionUuid);
+    }
+
     @Override
     public void registerRegion(Region region) {
         for (ChunkPos chunkPos : region.getChunks()) {
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java
index 1f33cae..182304f 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionPlayerTracker.java
@@ -1,9 +1,13 @@
 package de.kentoj.scrow.bukkit.region;
 
+import de.kentoj.scrow.bukkit.ScrowAPI;
 import de.kentoj.scrow.bukkit.region.impl.Region;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class RegionPlayerTracker {
 
@@ -20,6 +24,13 @@ public class RegionPlayerTracker {
         uuids.remove(player.getUniqueId());
     }
 
+    public Map<Region, Stream<Player>> getRegionsWithPlayers() {
+        return playersInRegion.entrySet().stream().collect(Collectors.toMap(
+                ent -> ScrowAPI.getRegionManager().getRegion(ent.getKey()),
+                ent -> ent.getValue().stream().map(Bukkit::getPlayer)
+        ));
+    }
+
     public boolean isInRegion(Region region, Player player) {
         var uuids = playersInRegion.get(region.getUuid());
         if (uuids == null) return false;
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java
index 57ddbea..9f2c950 100644
--- a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/region/RegionTask.java
@@ -15,9 +15,19 @@ public class RegionTask extends BukkitRunnable {
 
     @Override
     public void run() {
+        playerTracker.getRegionsWithPlayers().forEach((region, players) ->
+                players.forEach(player -> {
+                    if (!region.isInRegion(player.getLocation())) {
+                        var ev = new RegionLeaveEvent(region, player);
+                        Bukkit.getPluginManager().callEvent(ev);
+                        if (!ev.isCancelled())
+                            playerTracker.unregisterInRegion(region, player);
+                    }
+                })
+        );
+
         for (var player : Bukkit.getOnlinePlayers()) {
-            var regions = ScrowAPI.getREGION_MANAGER_IMPL().getRegions(ChunkPos.fromChunk(player.getLocation().getChunk()));
-            Bukkit.broadcastMessage(player.getName() + " is near " + regions.size() + " regions");
+            var regions = ScrowAPI.getRegionManager().getRegions(ChunkPos.fromChunk(player.getLocation().getChunk()));
             for (Region region : regions) {
                 var tracked = playerTracker.isInRegion(region, player);
                 var inside = region.isInRegion(player.getLocation());
@@ -26,11 +36,6 @@ public class RegionTask extends BukkitRunnable {
                     Bukkit.getPluginManager().callEvent(ev);
                     if (!ev.isCancelled())
                         playerTracker.registerInRegion(region, player);
-                } else if (tracked && !inside) {
-                    var ev = new RegionLeaveEvent(region, player);
-                    Bukkit.getPluginManager().callEvent(ev);
-                    if (!ev.isCancelled())
-                        playerTracker.unregisterInRegion(region, player);
                 }
             }
         }