Compare commits

...

3 Commits

Author SHA1 Message Date
c77037ce47 chore: add annotations to suppress IDE warnings 2024-01-20 20:36:28 +01:00
746bf93813 fix: fallback to area QueueCoordinator if null passed 2024-01-20 20:34:55 +01:00
a1d94af242 Fix home command reset (#4295)
* Add location not null check
The issue lies within the equals implementation

* Fix setposition method with default value.
Also add a comment too.

---------

Co-authored-by: OneLiteFeather <seelenretterin@onelitefeather.net>
2024-01-20 00:34:46 +01:00
3 changed files with 10 additions and 4 deletions

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);
} }

View File

@ -2401,7 +2401,8 @@ public class SQLManager implements AbstractDB {
addPlotTask(plot, new UniqueStatement("setPosition") { addPlotTask(plot, new UniqueStatement("setPosition") {
@Override @Override
public void set(PreparedStatement statement) throws SQLException { public void set(PreparedStatement statement) throws SQLException {
statement.setString(1, position == null ? "" : position); // Please see the table creation statement. There is the default value of "default"
statement.setString(1, position == null ? "DEFAULT" : position);
statement.setInt(2, getId(plot)); statement.setInt(2, getId(plot));
} }

View File

@ -1483,7 +1483,7 @@ public class Plot {
*/ */
public void setHome(BlockLoc location) { public void setHome(BlockLoc location) {
Plot plot = this.getBasePlot(false); Plot plot = this.getBasePlot(false);
if (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location)) { if (location != null && (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location))) {
return; return;
} }
plot.getSettings().setPosition(location); plot.getSettings().setPosition(location);