Compare commits

..

5 Commits

Author SHA1 Message Date
a791f99a13 Update build-pr.yml 2023-01-15 15:18:42 +01:00
f10d0b8fbb Update build-pr.yml 2023-01-15 15:14:10 +01:00
3fc380545f Update build-pr.yml 2023-01-15 15:02:25 +01:00
c22307bf47 Update build-pr.yml 2023-01-15 14:19:13 +01:00
20bac8bc9d Update README.md 2023-01-15 14:15:15 +01:00
18 changed files with 19 additions and 24 deletions

4
.gitattributes vendored
View File

@ -1,4 +0,0 @@
* text=auto
*.java text
*.jar binary

View File

@ -20,4 +20,4 @@ jobs:
distribution: temurin
java-version: 17
- name: Clean Build
run: ./gradlew clean build
run: ./gradlew clean build --warning-mode all

View File

@ -24,6 +24,7 @@ import org.bukkit.Bukkit;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Map;
import java.util.Objects;
public class BukkitWorld implements World<org.bukkit.World> {

View File

@ -80,3 +80,4 @@ public class FaweSchematicHandler extends SchematicHandler {
}
}

View File

@ -28,6 +28,7 @@ import com.plotsquared.core.generator.HybridUtils;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.plot.expiration.ExpireManager;
import com.plotsquared.core.plot.expiration.PlotAnalysis;
import com.plotsquared.core.plot.flag.GlobalFlagContainer;
import com.plotsquared.core.plot.flag.PlotFlag;
@ -41,6 +42,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;

View File

@ -144,7 +144,7 @@ public class ClassicPlotManager extends SquarePlotManager {
plot.getRegions(),
blocks,
classicPlotWorld.getMinBuildHeight(),
classicPlotWorld.getMaxBuildHeight() - 1,
classicPlotWorld.getMaxBuildHeight(),
actor,
queue
);
@ -175,7 +175,7 @@ public class ClassicPlotManager extends SquarePlotManager {
plot.getRegions(),
blocks,
classicPlotWorld.PLOT_HEIGHT + 1,
classicPlotWorld.getMaxBuildHeight() - 1,
classicPlotWorld.getMaxBuildHeight(),
actor,
queue
);
@ -281,7 +281,7 @@ public class ClassicPlotManager extends SquarePlotManager {
}
}
int maxY = classicPlotWorld.getMaxBuildHeight() - 1;
int maxY = classicPlotWorld.getMaxBuildHeight();
if (!plot.isMerged(Direction.NORTH)) {
int z = bottom.getZ();
for (int x = bottom.getX(); x <= top.getX(); x++) {

View File

@ -2506,7 +2506,7 @@ public class Plot {
}
}
int minHeight = getArea().getMinBuildHeight();
int maxHeight = getArea().getMaxBuildHeight() - 1;
int maxHeight = getArea().getMaxBuildHeight();
Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
visited.addAll(Lists.newArrayList((Iterable<? extends PlotId>) PlotId.PlotRangeIterator.range(bot, top)));

View File

@ -24,6 +24,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Collection;
import java.util.Objects;
/**
* A world that contains plots

View File

@ -24,6 +24,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Collection;
import java.util.Collections;
import java.util.Objects;
/**
* A plot flag is any property that can be assigned

View File

@ -19,6 +19,7 @@
package com.plotsquared.core.util;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion;

View File

@ -31,6 +31,7 @@ import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotArea;
import com.plotsquared.core.uuid.UUIDMapping;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.ArrayList;
import java.util.Arrays;

View File

@ -106,7 +106,7 @@ public class WEManager {
.getTrusted().contains(uuid))) && !plot.getFlag(NoWorldeditFlag.class)) {
for (CuboidRegion region : plot.getRegions()) {
BlockVector3 pos1 = region.getMinimumPoint().withY(area.getMinBuildHeight());
BlockVector3 pos2 = region.getMaximumPoint().withY(area.getMaxBuildHeight() - 1);
BlockVector3 pos2 = region.getMaximumPoint().withY(area.getMaxBuildHeight());
CuboidRegion copy = new CuboidRegion(pos1, pos2);
regions.add(copy);
}

View File

@ -55,3 +55,4 @@ public class AbstractDelegateOutputStream extends OutputStream {
}
}

View File

@ -21,6 +21,7 @@ package com.plotsquared.core.util.query;
import com.plotsquared.core.plot.Plot;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Objects;
import java.util.UUID;
class OwnersIncludeFilter implements PlotFilter {

View File

@ -83,3 +83,4 @@ public interface PlotSquaredTask extends Runnable {
}
}

View File

@ -276,3 +276,4 @@ public class AbstractDBTest implements AbstractDB {
}
}

View File

@ -20,16 +20,6 @@ plugins {
group = "com.plotsquared"
version = "6.10.9-SNAPSHOT"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""
**************************************************************************************
You need to fork and clone this repository! Don't download a .zip file.
If you need assistance, consult the GitHub docs: https://docs.github.com/get-started/quickstart/fork-a-repo
**************************************************************************************
""".trimIndent()
).also { kotlin.system.exitProcess(1) }
}
subprojects {
group = rootProject.group
version = rootProject.version
@ -100,9 +90,6 @@ subprojects {
java {
licenseHeaderFile(rootProject.file("HEADER.txt"))
target("**/*.java")
endWithNewline()
trimTrailingWhitespace()
removeUnusedImports()
}
}