forked from SteamWar/SteamWar
Fix connect behavior towards SpawnRegion
This commit is contained in:
+17
-25
@@ -24,8 +24,6 @@ import de.steamwar.bausystem.features.region.WireframeCommand;
|
||||
import de.steamwar.bausystem.region.dynamic.*;
|
||||
import de.steamwar.bausystem.region.dynamic.global.GlobalRegion;
|
||||
import lombok.NonNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.ToString;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@@ -158,33 +156,27 @@ public class DynamicRegionSystem implements RegionSystem {
|
||||
return regionTypeMap.getOrDefault(type, Collections.emptySet()).stream();
|
||||
}
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@ToString
|
||||
public static class Neighbour<T extends Region> {
|
||||
public final T region;
|
||||
public final Tile tile;
|
||||
public final NeighbourDirection direction;
|
||||
public record Neighbour<T extends Region>(T region, Tile tile, NeighbourDirection direction) {
|
||||
public <O extends Region> Neighbour<O> as(Class<O> clazz) {
|
||||
if (!clazz.isInstance(region)) {
|
||||
return null;
|
||||
} else {
|
||||
return (Neighbour<O>) this;
|
||||
}
|
||||
}
|
||||
|
||||
public <O extends Region> Neighbour<O> as(Class<O> clazz) {
|
||||
if (!clazz.isInstance(region)) {
|
||||
return null;
|
||||
} else {
|
||||
return (Neighbour<O>) this;
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (!(o instanceof Neighbour<?> neighbour)) return false;
|
||||
return Objects.equals(tile, neighbour.tile) && direction == neighbour.direction;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(tile, direction);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (!(o instanceof Neighbour<?> neighbour)) return false;
|
||||
return Objects.equals(tile, neighbour.tile) && direction == neighbour.direction;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(tile, direction);
|
||||
}
|
||||
}
|
||||
|
||||
private Stream<Neighbour<Region>> getNeighbours(Region region, boolean noCorners, boolean fastCache, Collection<Region> regions) {
|
||||
Tile minTile = Tile.fromPoint(region.getArea().getMinPoint(false)).orElse(null);
|
||||
Tile maxTile = Tile.fromPoint(region.getArea().getMaxPoint(false)).orElse(null);
|
||||
|
||||
Reference in New Issue
Block a user