Ensure sign isn't physicsed

- Also fixes schematic height issues

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,6 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.18.2'
         - '1.18.1'
         - '1.18'
         - '1.17.1'

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v2.4.0
       - name: Validate Gradle Wrapper"
         uses: gradle/wrapper-validation-action@v1.0.4
       - name: Setup Java

.github/workflows/codeql.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

.github/workflows/release-drafter.yml

@@ -14,6 +14,6 @@ jobs:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5.19.0
+      - uses: release-drafter/release-drafter@v5.18.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java

@@ -46,7 +46,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 public class SingleWorldListener implements Listener {
 
     private final Method methodGetHandleChunk;
-    private Field shouldSave = null;
+    private Field shouldSave;
 
     public SingleWorldListener() throws Exception {
         ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
@@ -59,12 +59,9 @@ public class SingleWorldListener implements Listener {
                 } else {
                     this.shouldSave = classChunk.getField("s").getRealField();
                 }
-            } else if (PlotSquared.platform().serverVersion()[1] == 17) {
+            } else {
                 ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
                 this.shouldSave = classChunk.getField("r").getRealField();
-            } else if (PlotSquared.platform().serverVersion()[1] == 18) {
-                ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
-                this.shouldSave = classChunk.getField("b").getRealField();
             }
         } catch (NoSuchFieldException e) {
             e.printStackTrace();

Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java

@@ -67,7 +67,7 @@ public class GenChunk extends ScopedQueueCoordinator {
      * @param minY minimum world Y, inclusive
      * @param maxY maximum world Y, inclusive
      *
-     * @since 6.6.0
+     * @since TODO
      */
     public GenChunk(int minY, int maxY) {
         super(null, Location.at("", 0, minY, 0), Location.at("", 15, maxY, 15));

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java

@@ -347,15 +347,13 @@ public class BukkitUtil extends WorldUtil {
             final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
             final Material type = block.getType();
             if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
-                BlockFace facing = BlockFace.NORTH;
-                if (!world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
-                    if (world.getBlockAt(location.getX() - 1, location.getY(), location.getZ()).getType().isSolid()) {
-                        facing = BlockFace.EAST;
-                    } else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
-                        facing = BlockFace.WEST;
-                    } else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
-                        facing = BlockFace.SOUTH;
-                    }
+                BlockFace facing = BlockFace.EAST;
+                if (world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
+                    facing = BlockFace.NORTH;
+                } else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
+                    facing = BlockFace.WEST;
+                } else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
+                    facing = BlockFace.SOUTH;
                 }
                 if (PlotSquared.platform().serverVersion()[1] == 13) {
                     block.setType(Material.valueOf(area.legacySignMaterial()), false);

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java

@@ -88,7 +88,7 @@ public class BukkitWorld implements World<org.bukkit.World> {
     /**
      * Get the min world height from a Bukkit {@link org.bukkit.World}. Inclusive
      *
-     * @since 6.6.0
+     * @since TODO
      */
     public static int getMinWorldHeight(org.bukkit.World world) {
         return HAS_MIN_Y ? world.getMinHeight() : 0;
@@ -97,7 +97,7 @@ public class BukkitWorld implements World<org.bukkit.World> {
     /**
      * Get the max world height from a Bukkit {@link org.bukkit.World}. Exclusive
      *
-     * @since 6.6.0
+     * @since TODO
      */
     public static int getMaxWorldHeight(org.bukkit.World world) {
         return HAS_MIN_Y ? world.getMaxHeight() : 256;
@@ -143,7 +143,7 @@ public class BukkitWorld implements World<org.bukkit.World> {
     /**
      * @deprecated This method is not meant to be invoked or overridden, with no replacement.
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof BukkitWorld;
     }

Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java

@@ -67,7 +67,7 @@ public class FaweSchematicHandler extends SchematicHandler {
             final PlotPlayer<?> actor,
             final RunnableVal<Boolean> whenDone
     ) {
-        delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, actor, whenDone);
+        delegate.paste(schematic, plot, xOffset, yOffset, zOffset, autoHeight, whenDone);
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -102,7 +102,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
      * Gets the default minimum world height for the version of Minecraft that the server is running.
      *
      * @return minimum world height
-     * @since 6.6.0
+     * @since TODO
      */
     int versionMinHeight();
 
@@ -110,7 +110,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
      * Gets the default maximum world height for the version of Minecraft that the server is running.
      *
      * @return maximum world height (inclusive)
-     * @since 6.6.0
+     * @since TODO
      */
     int versionMaxHeight();
 

Core/src/main/java/com/plotsquared/core/command/Confirm.java

@@ -48,7 +48,7 @@ public class Confirm extends SubCommand {
             player.sendMessage(TranslatableCaption.of("confirm.expired_confirm"));
             return false;
         }
-        TaskManager.runTask(command.command);
+        TaskManager.runTaskAsync(command.command);
         return true;
     }
 

Core/src/main/java/com/plotsquared/core/command/Load.java

@@ -40,7 +40,6 @@ import com.plotsquared.core.plot.schematic.Schematic;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.SchematicHandler;
-import com.plotsquared.core.util.TimeUtil;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.minimessage.Template;
@@ -206,7 +205,7 @@ public class Load extends SubCommand {
                     if (split.length < 5) {
                         continue;
                     }
-                    String time = TimeUtil.secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
+                    String time = secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
                     String world = split[1];
                     PlotId id = PlotId.fromString(split[2] + ';' + split[3]);
                     String size = split[4];
@@ -224,10 +223,6 @@ public class Load extends SubCommand {
         }
     }
 
-    /**
-     * @deprecated Use {@link TimeUtil#secToTime(long)}
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     public String secToTime(long time) {
         StringBuilder toreturn = new StringBuilder();
         if (time >= 33868800) {

Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java

@@ -605,7 +605,7 @@ public class HybridUtils {
      * @return if successful
      * @deprecated use {@link HybridUtils#regenerateRoad(PlotArea, BlockVector2, int, QueueCoordinator)}
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     public boolean regenerateRoad(final PlotArea area, final BlockVector2 chunk, int extend) {
         return regenerateRoad(area, chunk, extend, null);
     }
@@ -618,7 +618,7 @@ public class HybridUtils {
      * @param extend           How far to extend setting air above the road
      * @param queueCoordinator {@link QueueCoordinator} to use to set the blocks. Null if one should be created and enqueued
      * @return if successful
-     * @since 6.6.0
+     * @since TODO
      */
     public boolean regenerateRoad(
             final PlotArea area,

Core/src/main/java/com/plotsquared/core/listener/WESubscriber.java

@@ -35,7 +35,6 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.WEManager;
 import com.plotsquared.core.util.WorldUtil;
-import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
@@ -68,9 +67,6 @@ public class WESubscriber {
             WorldEdit.getInstance().getEventBus().unregister(this);
             return;
         }
-        if (event.getStage() != EditSession.Stage.BEFORE_HISTORY) {
-            return;
-        }
         World worldObj = event.getWorld();
         if (worldObj == null) {
             return;

Core/src/main/java/com/plotsquared/core/location/World.java

@@ -61,7 +61,7 @@ public interface World<T> {
     /**
      * Get the min world height. Inclusive.
      *
-     * @since 6.6.0
+     * @since TODO
      */
     int getMinHeight();
 
@@ -69,7 +69,7 @@ public interface World<T> {
     /**
      * Get the max world height. Inclusive.
      *
-     * @since 6.6.0
+     * @since TODO
      */
     int getMaxHeight();
 

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -122,7 +122,7 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
  */
 public class Plot {
 
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static final int MAX_HEIGHT = 256;
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Plot.class.getSimpleName());

Core/src/main/java/com/plotsquared/core/plot/PlotArea.java

@@ -1381,7 +1381,7 @@ public abstract class PlotArea {
     /**
      * Get the min height from which P2 will generate blocks. Inclusive.
      *
-     * @since 6.6.0
+     * @since TODO
      */
     public int getMinGenHeight() {
         return this.minGenHeight;
@@ -1390,7 +1390,7 @@ public abstract class PlotArea {
     /**
      * Get the max height to which P2 will generate blocks. Inclusive.
      *
-     * @since 6.6.0
+     * @since TODO
      */
     public int getMaxGenHeight() {
         return this.maxGenHeight;

Core/src/main/java/com/plotsquared/core/plot/PlotWorld.java

@@ -125,7 +125,7 @@ public abstract class PlotWorld {
     /**
      * @deprecated This method is not meant to be invoked or overridden, with no replacement.
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof PlotWorld;
     }

Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java

@@ -391,7 +391,7 @@ public class FlagContainer {
     /**
      * @deprecated This method is not meant to be invoked or overridden, with no replacement.
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof FlagContainer;
     }

Core/src/main/java/com/plotsquared/core/plot/flag/PlotFlag.java

@@ -221,7 +221,7 @@ public abstract class PlotFlag<T, F extends PlotFlag<T, F>> {
     /**
      * @deprecated This method is not meant to be invoked or overridden, with no replacement.
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof PlotFlag;
     }

Core/src/main/java/com/plotsquared/core/queue/LocalChunk.java

@@ -74,7 +74,7 @@ public class LocalChunk {
     /**
      * Get the minimum layer position stored (usually -4 or 0).
      *
-     * @since 6.6.0
+     * @since TODO
      */
     public int getMinSection() {
         return this.minSection;

Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java

@@ -77,7 +77,7 @@ public abstract class QueueCoordinator {
      * @return a new {@link ScopedQueueCoordinator}
      * @deprecated Use {@link ScopedQueueCoordinator#getForChunk(int, int, int, int)}
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     public ScopedQueueCoordinator getForChunk(int x, int z) {
         if (getWorld() == null) {
             return getForChunk(x, z, PlotSquared.platform().versionMinHeight(), PlotSquared.platform().versionMaxHeight());
@@ -91,7 +91,7 @@ public abstract class QueueCoordinator {
      * @param x chunk x coordinate
      * @param z chunk z coordinate
      * @return a new {@link ScopedQueueCoordinator}
-     * @since 6.6.0
+     * @since TODO
      */
     public ScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) {
         int bx = x << 4;

Core/src/main/java/com/plotsquared/core/util/RegionManager.java

@@ -379,7 +379,7 @@ public abstract class RegionManager {
         });
     }
 
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     public void setBiome(
             final CuboidRegion region,
             final int extendBiome,
@@ -398,7 +398,7 @@ public abstract class RegionManager {
      * @param biome       biome to set
      * @param area        {@link PlotArea} in which the biome is being set
      * @param whenDone    task to run when complete
-     * @since 6.6.0
+     * @since TODO
      */
     public void setBiome(
             final CuboidRegion region,

Core/src/main/java/com/plotsquared/core/util/RegionUtil.java

@@ -76,7 +76,7 @@ public class RegionUtil {
         return new CuboidRegion(min, max);
     }
 
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     public static CuboidRegion createRegion(int pos1x, int pos2x, int pos1z, int pos2z) {
         return createRegion(pos1x, pos2x, 0, 255, pos1z, pos2z);
     }

Core/src/main/java/com/plotsquared/core/util/TimeUtil.java

@@ -44,27 +44,27 @@ public final class TimeUtil {
         StringBuilder toReturn = new StringBuilder();
         if (time >= 33868800) {
             int years = (int) (time / 33868800);
-            time -= years * 33868800L;
+            time -= years * 33868800;
             toReturn.append(years).append("y ");
         }
         if (time >= 604800) {
             int weeks = (int) (time / 604800);
-            time -= weeks * 604800L;
+            time -= weeks * 604800;
             toReturn.append(weeks).append("w ");
         }
         if (time >= 86400) {
             int days = (int) (time / 86400);
-            time -= days * 86400L;
+            time -= days * 86400;
             toReturn.append(days).append("d ");
         }
         if (time >= 3600) {
             int hours = (int) (time / 3600);
-            time -= hours * 3600L;
+            time -= hours * 3600;
             toReturn.append(hours).append("h ");
         }
         if (time >= 60) {
             int minutes = (int) (time / 60);
-            time -= minutes * 60L;
+            time -= minutes * 60;
             toReturn.append(minutes).append("m ");
         }
         if (toReturn.length() == 0 || time > 0) {

Core/src/main/java/com/plotsquared/core/util/WEManager.java

@@ -25,6 +25,7 @@
  */
 package com.plotsquared.core.util;
 
+import com.fastasyncworldedit.core.regions.RegionWrapper;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.location.Location;
@@ -44,9 +45,6 @@ import java.util.UUID;
 
 public class WEManager {
 
-    private static final BlockVector3 MIN = BlockVector3.at(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
-    private static final BlockVector3 MAX = BlockVector3.at(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
-
     public static boolean maskContains(Set<CuboidRegion> mask, int x, int y, int z) {
         for (CuboidRegion region : mask) {
             if (RegionUtil.contains(region, x, y, z)) {
@@ -94,7 +92,7 @@ public class WEManager {
         Location location = player.getLocation();
         String world = location.getWorldName();
         if (!PlotSquared.get().getPlotAreaManager().hasPlotArea(world)) {
-            regions.add(new CuboidRegion(MIN, MAX));
+            regions.add(RegionWrapper.GLOBAL());
             return regions;
         }
         PlotArea area = player.getApplicablePlotArea();

Core/src/main/java/com/plotsquared/core/util/WorldUtil.java

@@ -96,7 +96,7 @@ public abstract class WorldUtil {
      * @param world  World name
      * @param region Region
      * @param biome  Biome
-     * @since 6.6.0
+     * @since TODO
      */
     public static void setBiome(String world, final CuboidRegion region, BiomeType biome) {
         PlotSquared.platform().worldUtil().setBiomes(world, region, biome);

Core/src/main/java/com/plotsquared/core/uuid/UUIDMapping.java

@@ -71,7 +71,7 @@ public class UUIDMapping {
     /**
      * @deprecated This method is not meant to be invoked or overridden, with no replacement.
      */
-    @Deprecated(forRemoval = true, since = "6.6.0")
+    @Deprecated(forRemoval = true, since = "TODO")
     protected boolean canEqual(final Object other) {
         return other instanceof UUIDMapping;
     }

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     idea
 }
 
-version = "6.6.2-SNAPSHOT"
+version = "6.5.2-SNAPSHOT"
 
 allprojects {
     group = "com.plotsquared"

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ guava = "31.0.1-jre" # Version set by Minecraft
 
 # Platform expectations
 paper = "1.18.1-R0.1-SNAPSHOT"
-checker-qual = "3.21.3"
+checker-qual = "3.21.2"
 guice = "5.1.0"
 findbugs = "3.0.1"
 snakeyaml = "1.30" # Version set by Bukkit
@@ -17,12 +17,12 @@ adventure-text-minimessage = "4.1.0-SNAPSHOT"
 adventure-platform-bukkit = "4.0.1"
 
 # Plugins
-worldedit = "7.2.10"
-fawe = "2.1.0"
+worldedit = "7.2.9"
+fawe = "2.0.1"
 vault = "1.7.1"
 placeholderapi = "2.11.1"
 luckperms = "5.4"
-essentialsx = "2.19.4"
+essentialsx = "2.19.2"
 mvdwapi = "3.1.1"
 
 # Third party

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -8,8 +8,7 @@
     "com.google.guava:guava",
     "com.google.code.gson:gson",
     "gson",
-    "snakeyaml",
-    "net.kyori"
+    "snakeyaml"
   ],
   "timezone": "Europe/Berlin",
   "schedule": [