Merge pull request '2.4.1 | WorldGuard bug' (#3) from OPsecurity-+-worldguard-flag-bug into main

Reviewed-on: JaTiTV/OPSecurity#3

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.jatitv</groupId>
     <artifactId>OPSecurity</artifactId>
-    <version>2.4.0_Snapshot_2</version>
+    <version>2.4.1</version>
     <packaging>jar</packaging>
 
     <name>OPSecurity</name>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>net.t2code</groupId>
             <artifactId>T2CodeLib</artifactId>
-            <version>10.0</version>
+            <version>10.1</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/de/jatitv/opsecurity/listener/Events.java

@@ -17,7 +17,10 @@ public class Events implements org.bukkit.event.Listener {
     public void CommandSendEvent(PlayerCommandPreprocessEvent event) {
         if (SelectConfig.CheckOnCommand) {
             Player player = event.getPlayer();
-            event.setCancelled(Check.onCheck(player, false));
+            if (Check.onCheck(player, false)) {
+                if (event.isCancelled()) return;
+                event.setCancelled(true);
+            }
         }
     }
 
@@ -26,9 +29,7 @@ public class Events implements org.bukkit.event.Listener {
         if (SelectConfig.CheckOnChat) {
             Player player = event.getPlayer();
             if (Check.onCheck(player, false)) {
-                if (event.isCancelled()) {
+                if (event.isCancelled()) return;
-                    return;
-                }
                 event.setCancelled(true);
             }
         }

src/main/java/de/jatitv/opsecurity/listener/LPCommand.java

@@ -18,6 +18,7 @@ import java.util.Iterator;
 
 public class LPCommand implements Listener {
 
+    /*
     private boolean LPCheck(String command) {
         if (command.charAt(0) == '/') {
             command = command.replaceFirst("/", "");
@@ -83,4 +84,6 @@ public class LPCommand implements Listener {
             event.setCancelled(true);
         }
     }
+
+     */
 }

src/main/java/de/jatitv/opsecurity/listener/OPCommand.java

@@ -21,7 +21,45 @@ import org.bukkit.event.server.ServerCommandEvent;
 
 public class OPCommand implements Listener {
 
+    @EventHandler
+    public void onOPServer(ServerCommandEvent event) {
+
+        if ((event.getCommand().toLowerCase().startsWith("op ") || event.getCommand().toLowerCase().startsWith("minecraft:op ")) && SelectConfig.OP_Whitelist_Enable) {
+            switch (this.isNotOPWTL(event.getCommand())) {
+                case 1:
+                    send.sender(event.getSender(), Util.getPrefix() + " " + SelectMessages.PlayerMustBeOnlineToOp);
+                    event.setCancelled(true);
+                    break;
+                case 2:
+                    send.sender(event.getSender(), (Replace.replace(Util.getPrefix(), Util.getPrefix() + " " + SelectMessages.OP_opCommand)));
+                    event.setCancelled(true);
+                    break;
+            }
+        }
+
+    }
+
+    @EventHandler
+    public void onOpPlayer(PlayerCommandPreprocessEvent event) {
+
+        if (SelectConfig.OP_Whitelist_Enable) {
+            if ((event.getMessage().toLowerCase().startsWith("/op ") || event.getMessage().toLowerCase().startsWith("/minecraft:op "))) {
+                switch (this.isNotOPWTL(event.getMessage())) {
+                    case 1:
+                        send.sender(event.getPlayer(), Util.getPrefix() + " " + SelectMessages.PlayerMustBeOnlineToOp);
+                        event.setCancelled(true);
+                        break;
+                    case 2:
+                        send.player(event.getPlayer(), Replace.replace(Util.getPrefix(), Util.getPrefix() + " " + SelectMessages.OP_opCommand));
+                        event.setCancelled(true);
+                        break;
+                }
+            }
+        }
+    }
+
     private int isNotOPWTL(String command) {
+        if (!command.contains("op")) return 0;
         if (command.charAt(0) == '/') command = command.replaceFirst("/", "");
         String arg = command.replace("op ", "");
 
@@ -49,39 +87,4 @@ public class OPCommand implements Listener {
             } else return 2;
         }
     }
-
-    @EventHandler
-    public void onOPServer(ServerCommandEvent event) {
-        if ((event.getCommand().toLowerCase().startsWith("op ") || event.getCommand().toLowerCase().startsWith("minecraft:op ")) && SelectConfig.OP_Whitelist_Enable) {
-            switch (this.isNotOPWTL(event.getCommand())) {
-                case 1:
-                    send.sender(event.getSender(), Util.getPrefix() + " " + SelectMessages.PlayerMustBeOnlineToOp);
-                    event.setCancelled(true);
-                    break;
-                case 2:
-                    send.sender(event.getSender(), (Replace.replace(Util.getPrefix(), Util.getPrefix() + " " + SelectMessages.OP_opCommand)));
-                    event.setCancelled(true);
-                    break;
-            }
-        }
-
-    }
-
-    @EventHandler
-    public void onOpPlayer(PlayerCommandPreprocessEvent event) {
-        if (SelectConfig.OP_Whitelist_Enable) {
-            if ((event.getMessage().toLowerCase().startsWith("/op ") || event.getMessage().toLowerCase().startsWith("/minecraft:op "))) {
-                switch (this.isNotOPWTL(event.getMessage())) {
-                    case 1:
-                        send.sender(event.getPlayer(), Util.getPrefix() + " " + SelectMessages.PlayerMustBeOnlineToOp);
-                        event.setCancelled(true);
-                        break;
-                    case 2:
-                        send.player(event.getPlayer(), Replace.replace(Util.getPrefix(), Util.getPrefix() + " " + SelectMessages.OP_opCommand));
-                        event.setCancelled(true);
-                        break;
-                }
-            }
-        }
-    }
 }

src/main/java/de/jatitv/opsecurity/listener/PlugManCommand.java

@@ -15,6 +15,7 @@ public class PlugManCommand implements Listener {
 
     @EventHandler
     public void onOPServer(ServerCommandEvent event) {
+
         if ((event.getCommand().toLowerCase().contains("plugman disable") && event.getCommand().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase()))
                 || (event.getCommand().toLowerCase().contains("plugman reload") && event.getCommand().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase()))
                 || (event.getCommand().toLowerCase().contains("plugman unload") && event.getCommand().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase()))
@@ -27,6 +28,7 @@ public class PlugManCommand implements Listener {
 
     @EventHandler
     public void onOpPlayer(PlayerCommandPreprocessEvent event) {
+
         if (event.getMessage().toLowerCase().startsWith("/plugman disable") && event.getMessage().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase())
                 || (event.getMessage().toLowerCase().startsWith("/plugman reload") && event.getMessage().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase()))
                 || (event.getMessage().toLowerCase().startsWith("/plugman unload") && event.getMessage().toLowerCase().contains(Main.plugin.getDescription().getName().toLowerCase()))