SteamWar/BauSystem2.0
Archiviert
12
0

Merge remote-tracking branch 'origin/master'

Dieser Commit ist enthalten in:
Zeanon 2021-05-01 18:31:44 +02:00
Commit 2800c8dc01
2 geänderte Dateien mit 9 neuen und 17 gelöschten Zeilen

Datei anzeigen

@ -79,6 +79,9 @@ public class AutostartListener implements Listener {
@EventHandler
public void onEntityExplode(EntityExplodeEvent event) {
if (regionStartTime.isEmpty()) {
return;
}
event.blockList().forEach(block -> {
Region region = Region.getRegion(block.getLocation());
if (!regionStartTime.containsKey(region)) return;

Datei anzeigen

@ -37,10 +37,7 @@ import yapion.hierarchy.types.YAPIONValue;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Predicate;
import static de.steamwar.bausystem.region.RegionUtils.paste;
@ -51,22 +48,14 @@ public class Region {
private static final List<Region> REGION_LIST = new ArrayList<>();
public static Region getRegion(Location location) {
String s = Thread.currentThread().getStackTrace()[2].toString();
if (!s.contains("sidebar")) {
System.out.println(s +" " + location);
}
for (Region region : REGION_LIST) {
if (region.inRegion(location, region.minPoint, region.maxPoint)) {
return region;
}
}
return GlobalRegion.instance;
return REGION_LIST.stream()
.filter(r -> r.inRegion(location, r.minPoint, r.maxPoint))
.findFirst()
.orElse(GlobalRegion.instance);
}
public static void setGlobal(Flag flagType, Flag.Value<?> value) {
for (Region region : REGION_LIST) {
region.set(flagType, value);
}
REGION_LIST.forEach(region -> region.set(flagType, value));
}
YAPIONObject regionData;