Optimize things

src/main/java/net/tonimatasdev/perworldplugins/PerWorldPlugins.java

@@ -55,7 +55,7 @@ public void onEnable() {
             // Convert listeners and set worlds to commands.
             ListenerManager.convert();
             // Register all converted commands.
-            CommandManager.init();
+            CommandManager.setWorldsToCommands();
 
             // Send a message on finish all Events/Commands.
             Bukkit.getConsoleSender().sendMessage("[PerWorldPlugins] " + ChatColor.GREEN + "Converted all Listeners/Commands correctly.");

src/main/java/net/tonimatasdev/perworldplugins/manager/CommandManager.java

@@ -13,30 +13,24 @@
 
 public class CommandManager implements Listener {
     private static final List<String> defaultCommands = Arrays.asList("version", "timings", "reload", "plugins", "tps", "mspt", "paper", "spigot", "restart", "perworldplugins");
-    private static final List<PerWorldCommand> commands = new ArrayList<>();
-
-    public static void init() {
-        // Replace all Commands to PerWorldCommands.
-        commands.forEach(CommandManager::replace);
-
-        // Set the blocked worlds to the commands.
-        setWorldsToCommands();
-        commands.clear();
-    }
 
     public static void addPluginCommands(Plugin plugin) {
         // Get all keys.
+        List<Command> replaced = new ArrayList<>();
+
         for (String key : getCommands().keySet()) {
             // Get PerWorldCommand and add to perWorldCommands list.
             Command command = getCommands().get(key);
 
             // If a default command or PerWorldCommand, continue.
             if (defaultCommands.contains(command.getName()) || command instanceof PerWorldCommand) continue;
             // If the command are registered, continue.
-            if (commands.stream().anyMatch(perWorldCommand -> perWorldCommand.getName().equals(command.getName()) || perWorldCommand.getAliases().contains(command.getName()))) continue;
+            if (replaced.contains(command)) continue;
+
+            // Replace command and add to replaced list.
+            replace(PerWorldCommand.get(command, plugin));
 
-            // Get and add PerWorldCommand.
-            commands.add(PerWorldCommand.get(command, plugin));
+            replaced.add(command);
         }
     }