From db414164dc732c788a6b4bc6473a5ede053964b4 Mon Sep 17 00:00:00 2001
From: speedxx <43330808+speedxx@users.noreply.github.com>
Date: Thu, 23 Jul 2020 19:05:38 -0400
Subject: [PATCH] fix nickclean not being registered

also allow for ops/non-ops to run /opme, there isn't any reason as to why this command should be limited to  admins only
---
 .../totalfreedommod/command/Command_nickclean.java     | 10 ++--------
 .../totalfreedommod/command/Command_opme.java          |  5 ++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java
index 78fa7015..e43111ab 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickclean.java
@@ -16,15 +16,9 @@ import org.bukkit.entity.Player;
 public class Command_nickclean extends FreedomCommand
 {
 
-    private static final String[] BLOCK = ConfigEntry.BLOCKED_CHATCODES.getString().split(",");
-
-    private static final Pattern REGEX = Pattern.compile(FUtil.colorize(ChatColor.COLOR_CHAR + "[" + StringUtils.join(BLOCK, "") + "]"), Pattern.CASE_INSENSITIVE);
-
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        FUtil.adminAction(sender.getName(), "Cleaning all nicknames", false);
-
         if (args.length > 1)
         {
             Player player = getPlayer(args[0]);
@@ -40,7 +34,6 @@ public class Command_nickclean extends FreedomCommand
             return true;
         }
 
-
         FUtil.adminAction(sender.getName(), "Cleaning all nicknames", false);
         for (final Player player : server.getOnlinePlayers())
         {
@@ -53,6 +46,7 @@ public class Command_nickclean extends FreedomCommand
     {
         final String playerName = player.getName();
         final String nickName = plugin.esb.getNickname(playerName);
+        final Pattern REGEX = Pattern.compile(FUtil.colorize(ChatColor.COLOR_CHAR + "[" + StringUtils.join(ConfigEntry.BLOCKED_CHATCODES.getString().split(","), "") + "]"), Pattern.CASE_INSENSITIVE);
         if (nickName != null && !nickName.isEmpty() && !nickName.equalsIgnoreCase(playerName))
         {
             final Matcher matcher = REGEX.matcher(nickName);
@@ -64,4 +58,4 @@ public class Command_nickclean extends FreedomCommand
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java
index 9928d769..eaadd8fc 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_opme.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "OPs the command sender.", usage = "/<command>")
 public class Command_opme extends FreedomCommand
 {
@@ -17,7 +17,6 @@ public class Command_opme extends FreedomCommand
         FUtil.adminAction(sender.getName(), "Opping " + sender.getName(), false);
         sender.setOp(true);
         sender.sendMessage(FreedomCommand.YOU_ARE_OP);
-
         return true;
     }
-}
+}
\ No newline at end of file