Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't access tree until it has been created

Browse Source
This commit is contained in:
Alexander Söderberg 2020-05-21 20:23:36 +02:00
parent 1c6075df2b
commit 38a7c771be
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/main/java/com/plotsquared/core/plot/world/ScatteredPlotWorld.java
View File

@ -62,6 +62,9 @@ public class ScatteredPlotWorld extends PlotWorld {
} }
@Override @Nullable public PlotArea getArea(@NotNull final Location location) { @Override @Nullable public PlotArea getArea(@NotNull final Location location) {
if (this.areas.isEmpty()) {
return null;
}
synchronized (this.treeLock) { synchronized (this.treeLock) {
final Observable<Entry<PlotArea, Geometry>> area = final Observable<Entry<PlotArea, Geometry>> area =
areaTree.search(Geometries.point(location.getX(), location.getZ())); areaTree.search(Geometries.point(location.getX(), location.getZ()));
@ -87,6 +90,9 @@ public class ScatteredPlotWorld extends PlotWorld {
} }
@Override @NotNull public Collection<PlotArea> getAreasInRegion(@NotNull final CuboidRegion region) { @Override @NotNull public Collection<PlotArea> getAreasInRegion(@NotNull final CuboidRegion region) {
if (this.areas.isEmpty()) {
return Collections.emptyList();
}
synchronized (this.treeLock) { synchronized (this.treeLock) {
final List<PlotArea> areas = new LinkedList<>(); final List<PlotArea> areas = new LinkedList<>();
this.areaTree.search(RegionUtil.toRectangle(region)).toBlocking().forEach(entry -> areas.add(entry.value())); this.areaTree.search(RegionUtil.toRectangle(region)).toBlocking().forEach(entry -> areas.add(entry.value()));