Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix RegionSystem.GLOBAL_REGION_ID

Browse Source 
Improve RegionUtils.forEachInRegion
This commit is contained in:
YoyoNow
2026-02-19 21:01:20 +01:00
parent a580087df8
commit 5f1aef6a1e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+2 -2
View File
@@ -31,10 +31,10 @@ import java.util.stream.Stream;
public interface RegionSystem { public interface RegionSystem {
RegionSystem INSTANCE = init();
UUID GLOBAL_REGION_ID = new UUID(0, 0); UUID GLOBAL_REGION_ID = new UUID(0, 0);
RegionSystem INSTANCE = init();
/** /**
* Loads and initializes the Regions and anything that should be loaded on startup. * Loads and initializes the Regions and anything that should be loaded on startup.
*/ */
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
+8 -5
View File
@@ -28,6 +28,7 @@ import org.bukkit.entity.Player;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Stream;
@UtilityClass @UtilityClass
public class RegionUtils { public class RegionUtils {
@@ -58,10 +59,12 @@ public class RegionUtils {
} }
public void forEachInRegion(Region region, Consumer<Player> consumer) { public void forEachInRegion(Region region, Consumer<Player> consumer) {
Bukkit.getOnlinePlayers() Stream<? extends Player> players = Bukkit.getOnlinePlayers().stream();
.stream() if (region.getType().isGlobal()) {
.filter(player -> region.getArea().inRegion(player.getLocation(), false)) players = players.filter(player -> Region.getRegion(player.getLocation()).getType().isGlobal());
.filter(player -> !region.getType().isGlobal() || Region.getRegion(player.getLocation()).getType().isGlobal()) } else {
.forEach(consumer); players = players.filter(player -> region.getArea().inRegion(player.getLocation(), false));
}
players.forEach(consumer);
} }
} }