build: Release 6.6.2

Co-authored-by: Renovate Bot <bot@renovateapp.com>

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

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

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

@@ -227,7 +227,7 @@ public class Load extends SubCommand {
     /**
      * @deprecated Use {@link TimeUtil#secToTime(long)}
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    @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,6 +29,7 @@ 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;

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     idea
 }
 
-version = "6.6.2-SNAPSHOT"
+version = "6.6.2"
 
 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.4"
 guice = "5.1.0"
 findbugs = "3.0.1"
 snakeyaml = "1.30" # Version set by Bukkit

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.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists