EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-24 14:16:44 +01:00
Code Issues Projects Releases Wiki Activity

Fallback to areas QueueCoordinator when passing null (#4300)

Browse Source 
* fix: fallback to area QueueCoordinator if null passed

* chore: add annotations to suppress IDE warnings
This commit is contained in:
Pierre Maurice Schwang 2024-01-21 12:40:38 +01:00 committed by GitHub
parent 9566af5fda
commit ae941e67a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java
View File

@ -37,7 +37,9 @@ import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import java.util.Set; import java.util.Set;
public class FaweRegionManager extends BukkitRegionManager { public class FaweRegionManager extends BukkitRegionManager {
@ -59,7 +61,10 @@ public class FaweRegionManager extends BukkitRegionManager {
@Nullable PlotPlayer<?> actor, @Nullable PlotPlayer<?> actor,
@Nullable QueueCoordinator queue @Nullable QueueCoordinator queue
) { ) {
return delegate.setCuboids(area, regions, blocks, minY, maxY, queue.getCompleteTask()); return delegate.setCuboids(
area, regions, blocks, minY, maxY,
Objects.requireNonNullElseGet(queue, area::getQueue).getCompleteTask()
);
} }
@Override @Override
@ -111,7 +116,7 @@ public class FaweRegionManager extends BukkitRegionManager {
} }
@Override @Override
public boolean regenerateRegion(final Location pos1, final Location pos2, boolean ignore, final Runnable whenDone) { public boolean regenerateRegion(final @NotNull Location pos1, final @NotNull Location pos2, boolean ignore, final Runnable whenDone) {
return delegate.regenerateRegion(pos1, pos2, ignore, whenDone); return delegate.regenerateRegion(pos1, pos2, ignore, whenDone);
} }