From e8a3c26650815fa3032c9ca82e521cb07b8dbe1a Mon Sep 17 00:00:00 2001
From: JaTiTV <info.jatitv@gmail.com>
Date: Sun, 9 Jan 2022 04:44:10 +0100
Subject: [PATCH] code changes

---
 .../jatitv/opsecurity/listener/LPCommand.java |  3 +
 .../jatitv/opsecurity/listener/OPCommand.java | 58 +++++++++----------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/main/java/de/jatitv/opsecurity/listener/LPCommand.java b/src/main/java/de/jatitv/opsecurity/listener/LPCommand.java
index 4f6be4c..b52978d 100644
--- a/src/main/java/de/jatitv/opsecurity/listener/LPCommand.java
+++ b/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);
         }
     }
+
+     */
 }
diff --git a/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java b/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java
index 7e97748..1e7dc9b 100644
--- a/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java
+++ b/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java
@@ -21,35 +21,6 @@ import org.bukkit.event.server.ServerCommandEvent;
 
 public class OPCommand implements Listener {
 
-    private int isNotOPWTL(String command) {
-        if (command.charAt(0) == '/') command = command.replaceFirst("/", "");
-        String arg = command.replace("op ", "");
-
-        if (SelectConfig.PlayerMustBeOnlineToOp) {
-            if (Main.opHashMap.containsKey(arg.toLowerCase())) {
-                Player target = Bukkit.getPlayer(arg);
-                if (target == null) {
-                    return 1;
-                }
-                if (Main.opHashMap.get(target.getName().toLowerCase()).UUID.equals(target.getUniqueId().toString().replace("-", ""))) {
-                    return 0;
-                } else return 2;
-            } else return 2;
-        } else {
-            if (Main.opHashMap.containsKey(arg.toLowerCase())) {
-                String targetUUID = null;
-                try {
-                    targetUUID = NameHistory.getPlayerUUID(arg);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                if (Main.opHashMap.get(arg.toLowerCase()).UUID.equals(targetUUID)) {
-                    return 0;
-                } else return 2;
-            } 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) {
@@ -84,4 +55,33 @@ public class OPCommand implements Listener {
             }
         }
     }
+
+    private int isNotOPWTL(String command) {
+        if (command.charAt(0) == '/') command = command.replaceFirst("/", "");
+        String arg = command.replace("op ", "");
+
+        if (SelectConfig.PlayerMustBeOnlineToOp) {
+            if (Main.opHashMap.containsKey(arg.toLowerCase())) {
+                Player target = Bukkit.getPlayer(arg);
+                if (target == null) {
+                    return 1;
+                }
+                if (Main.opHashMap.get(target.getName().toLowerCase()).UUID.equals(target.getUniqueId().toString().replace("-", ""))) {
+                    return 0;
+                } else return 2;
+            } else return 2;
+        } else {
+            if (Main.opHashMap.containsKey(arg.toLowerCase())) {
+                String targetUUID = null;
+                try {
+                    targetUUID = NameHistory.getPlayerUUID(arg);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                if (Main.opHashMap.get(arg.toLowerCase()).UUID.equals(targetUUID)) {
+                    return 0;
+                } else return 2;
+            } else return 2;
+        }
+    }
 }