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 @@
-
-
+
-
-
+
+
@@ -281,10 +280,10 @@
+
-
@@ -304,7 +303,15 @@
1782666067624
-
+
+
+ 1782673270039
+
+
+
+ 1782673270039
+
+
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 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> 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);
}
}
}