Fixes a regex bug that replaced every [player] char instead of whole …

…word.
BentoBoxWorld · Jan 30, 2023 · 468232c · 468232c
1 parent 0d69459
commit 468232c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java b/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
@@ -806,9 +806,9 @@ private void runCommands(List<String> commands)
                 String alert = "Running command '" + cmd + "' as " + this.user.getName();
                 this.addon.getLogger().info(alert);
                 cmd = cmd.substring(6).
-                    replaceAll(Constants.PARAMETER_PLAYER, this.user.getName()).
-                    replaceAll(Constants.PARAMETER_OWNER, owner).
-                    replaceAll(Constants.PARAMETER_NAME, island == null || island.getName() == null ? "" : island.getName()).
+                    replaceAll(Constants.ESC + Constants.PARAMETER_PLAYER, this.user.getName()).
+                    replaceAll(Constants.ESC + Constants.PARAMETER_OWNER, owner).
+                    replaceAll(Constants.ESC + Constants.PARAMETER_NAME, island == null || island.getName() == null ? "" : island.getName()).
                     trim();
                 try
                 {
@@ -829,9 +829,9 @@ private void runCommands(List<String> commands)
 
             try
             {
-                cmd = cmd.replaceAll(Constants.PARAMETER_PLAYER, this.user.getName()).
-                    replaceAll(Constants.PARAMETER_OWNER, owner).
-                    replaceAll(Constants.PARAMETER_NAME, island == null || island.getName() == null ? "" : island.getName()).
+                cmd = cmd.replaceAll(Constants.ESC + Constants.PARAMETER_PLAYER, this.user.getName()).
+                    replaceAll(Constants.ESC + Constants.PARAMETER_OWNER, owner).
+                    replaceAll(Constants.ESC + Constants.PARAMETER_NAME, island == null || island.getName() == null ? "" : island.getName()).
                     trim();
 
                 if (!this.addon.getServer().dispatchCommand(this.addon.getServer().getConsoleSender(), cmd))

diff --git a/src/main/java/world/bentobox/challenges/utils/Constants.java b/src/main/java/world/bentobox/challenges/utils/Constants.java
@@ -223,4 +223,9 @@ public class Constants
      * Reference string to challenge parameter in translations.
      */
     public static final String PARAMETER_CHALLENGE = "[challenge]";
+
+    /**
+     * Regex escape chars.
+     */
+    public static final String ESC = "\\";
 }