fix errors when using regex expressions in executing command

YouHaveTrouble · Oct 8, 2022 · 153ad5f · 153ad5f
1 parent 9e5b5b5
commit 153ad5f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/CommandWhitelistBukkit/pom.xml b/CommandWhitelistBukkit/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
     </parent>
 
     <artifactId>Bukkit</artifactId>

diff --git a/.../java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java b/.../java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java
@@ -20,7 +20,11 @@ public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreproce
         if (player.hasPermission(CWPermission.BYPASS.permission())) return;
         String caseSensitiveLabel = CommandUtil.getCommandLabel(event.getMessage());
         String label = caseSensitiveLabel.toLowerCase();
-        event.setMessage(event.getMessage().replaceFirst(caseSensitiveLabel, label));
+
+        String fullCommand = event.getMessage().substring(label.length()+1);
+        fullCommand = "/"+label+fullCommand;
+
+        event.setMessage(fullCommand);
         BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
         ConfigCache config = CommandWhitelistBukkit.getConfigCache();
 

diff --git a/CommandWhitelistCommon/pom.xml b/CommandWhitelistCommon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
     </parent>
 
     <artifactId>Common</artifactId>

diff --git a/CommandWhitelistVelocity/pom.xml b/CommandWhitelistVelocity/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
     </parent>
 
     <artifactId>Velocity</artifactId>

diff --git a/CommandWhitelistWaterfall/pom.xml b/CommandWhitelistWaterfall/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.endermite.commandwhitelist</groupId>
         <artifactId>CommandWhitelist</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
     </parent>
 
     <artifactId>Waterfall</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite.commandwhitelist</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.3</version>
     <modules>
         <module>CommandWhitelistCommon</module>
         <module>CommandWhitelistBukkit</module>