Only add extent to WE operations once

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

@@ -76,6 +76,7 @@ import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PremiumVerification;
+import com.plotsquared.core.util.RegExUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
@@ -222,9 +223,10 @@ public class PlayerEventListener extends PlotListener implements Listener {
         }
     }
 
+    @SuppressWarnings("StringSplitter")
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void playerCommand(PlayerCommandPreprocessEvent event) {
-        String msg = event.getMessage().replace("/", "").toLowerCase(Locale.ROOT).trim();
+        String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
         if (msg.isEmpty()) {
             return;
         }
@@ -238,9 +240,11 @@ public class PlayerEventListener extends PlotListener implements Listener {
         String[] parts = msg.split(" ");
         Plot plot = plotPlayer.getCurrentPlot();
         // Check WorldEdit
-        switch (parts[0]) {
+        switch (parts[0].toLowerCase()) {
             case "up":
+            case "/up":
             case "worldedit:up":
+            case "worldedit:/up":
                 if (plot == null || (!plot.isAdded(plotPlayer.getUUID()) && !Permissions
                         .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_OTHER, true))) {
                     event.setCancelled(true);
@@ -254,67 +258,63 @@ public class PlayerEventListener extends PlotListener implements Listener {
         List<String> blockedCommands = plot != null ?
                 plot.getFlag(BlockedCmdsFlag.class) :
                 area.getFlag(BlockedCmdsFlag.class);
-        if (blockedCommands.isEmpty()) {
-            return;
-        }
-        if (Permissions.hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-            return;
-        }
-        // When using namespaced commands, we're not interested in the namespace
-        String part = parts[0];
-        if (part.contains(":")) {
-            String[] namespaced = part.split(":");
-            part = namespaced[1];
-            msg = msg.substring(namespaced[0].length() + 1);
-        }
-        msg = replaceAliases(msg, part);
-        for (String blocked : blockedCommands) {
-            if (blocked.equalsIgnoreCase(msg)) {
-                String perm;
-                if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
-                    perm = "plots.admin.command.blocked-cmds.shared";
+        if (!blockedCommands.isEmpty() && !Permissions
+                .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
+            String part = parts[0];
+            if (parts[0].contains(":")) {
+                part = parts[0].split(":")[1];
+                msg = msg.replace(parts[0].split(":")[0] + ':', "");
+            }
+            String s1 = part;
+            List<String> aliases = new ArrayList<>();
+            for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
+                if (part.equals(cmdLabel.getName())) {
+                    break;
+                }
+                String label = cmdLabel.getName().replaceFirst("/", "");
+                if (aliases.contains(label)) {
+                    continue;
+                }
+                PluginCommand p;
+                if ((p = Bukkit.getPluginCommand(label)) != null) {
+                    for (String a : p.getAliases()) {
+                        if (aliases.contains(a)) {
+                            continue;
+                        }
+                        aliases.add(a);
+                        a = a.replaceFirst("/", "");
+                        if (!a.equals(label) && a.equals(part)) {
+                            part = label;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (!s1.equals(part)) {
+                msg = msg.replace(s1, part);
+            }
+            for (String s : blockedCommands) {
+                Pattern pattern;
+                if (!RegExUtil.compiledPatterns.containsKey(s)) {
+                    RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
                 } else {
-                    perm = "plots.admin.command.blocked-cmds.road";
+                    pattern = RegExUtil.compiledPatterns.get(s);
                 }
-                if (!Permissions.hasPermission(plotPlayer, perm)) {
-                    plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
-                    event.setCancelled(true);
-                }
-                return;
-            }
-        }
-    }
-
-    private String replaceAliases(String msg, String part) {
-        String s1 = part;
-        Set<String> aliases = new HashSet<>();
-        for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
-            if (part.equals(cmdLabel.getName())) {
-                break;
-            }
-            String label = cmdLabel.getName().replaceFirst("/", "");
-            if (aliases.contains(label)) {
-                continue;
-            }
-            PluginCommand p = Bukkit.getPluginCommand(label);
-            if (p != null) {
-                for (String a : p.getAliases()) {
-                    if (aliases.contains(a)) {
-                        continue;
+                if (pattern.matcher(msg).matches()) {
+                    String perm;
+                    if (plot != null && plot.isAdded(plotPlayer.getUUID())) {
+                        perm = "plots.admin.command.blocked-cmds.shared";
+                    } else {
+                        perm = "plots.admin.command.blocked-cmds.road";
                     }
-                    aliases.add(a);
-                    a = a.replaceFirst("/", "");
-                    if (!a.equals(label) && a.equals(part)) {
-                        part = label;
-                        break;
+                    if (!Permissions.hasPermission(plotPlayer, perm)) {
+                        plotPlayer.sendMessage(TranslatableCaption.of("blockedcmds.command_blocked"));
+                        event.setCancelled(true);
                     }
+                    return;
                 }
             }
         }
-        if (!s1.equals(part)) {
-            msg = msg.replace(s1, part);
-        }
-        return msg;
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

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

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 = "6.6.2")
     public String secToTime(long time) {
         StringBuilder toreturn = new StringBuilder();
         if (time >= 33868800) {

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

@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-@Deprecated(since = "6.6.2", forRemoval = true)
 public class RegExUtil {
 
     public static Map<String, Pattern> compiledPatterns;

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) {

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     idea
 }
 
-version = "6.6.2"
+version = "6.6.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.4"
+checker-qual = "3.21.3"
 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.2-SNAPSHOT"
 vault = "1.7.1"
 placeholderapi = "2.11.1"
 luckperms = "5.4"
-essentialsx = "2.19.4"
+essentialsx = "2.19.3"
 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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.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": [