Skip to content

Commit 1a01139

Browse files
committedMar 7, 2025·
feat!: Remove CommandManager static instances
1 parent 6521c6d commit 1a01139

File tree

3 files changed

+0
-64
lines changed

3 files changed

+0
-64
lines changed
 

‎src/main/java/me/adrigamer2950/adriapi/api/command/manager/CommandManager.java

-28
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
import me.adrigamer2950.adriapi.api.APIPlugin;
55
import me.adrigamer2950.adriapi.api.command.Command;
66
import me.adrigamer2950.adriapi.api.event.command.CommandLoadedEvent;
7-
import me.adrigamer2950.adriapi.api.exceptions.DuplicatedManagerException;
87
import me.adrigamer2950.adriapi.api.exceptions.command.CommandNotInPluginYMLException;
98
import me.adrigamer2950.adriapi.api.logger.APILogger;
109
import org.bukkit.Bukkit;
1110
import org.bukkit.command.CommandMap;
1211
import org.bukkit.command.PluginCommand;
13-
import org.bukkit.plugin.Plugin;
14-
import org.jetbrains.annotations.ApiStatus;
1512

1613
import java.util.ArrayList;
1714
import java.util.List;
@@ -29,20 +26,6 @@ public final class CommandManager<T extends APIPlugin> {
2926

3027
public final APILogger LOGGER;
3128
private final List<Command<? extends APIPlugin>> cmds = new ArrayList<>();
32-
@ApiStatus.Internal
33-
public static final List<CommandManager<? extends APIPlugin>> COMMAND_MANAGERS = new ArrayList<>();
34-
35-
/**
36-
* @param plugin The plugin
37-
* @return The plugin if it has a Command Manager, null otherwise
38-
*/
39-
public static CommandManager<? extends APIPlugin> getManager(Plugin plugin) {
40-
for (CommandManager<? extends APIPlugin> cmdM : COMMAND_MANAGERS)
41-
if (cmdM.getPlugin().equals(plugin))
42-
return cmdM;
43-
44-
return null;
45-
}
4629

4730
@Getter
4831
private final T plugin;
@@ -51,20 +34,9 @@ public static CommandManager<? extends APIPlugin> getManager(Plugin plugin) {
5134
* @param pl The plugin
5235
*/
5336
public CommandManager(T pl) {
54-
if (getManager(pl) != null) {
55-
throw new DuplicatedManagerException(
56-
String.format("Command Manager for plugin %s v%s has already been created and cannot be duplicated",
57-
pl.getName(),
58-
pl.getDescription().getVersion()
59-
)
60-
);
61-
}
62-
6337
this.plugin = pl;
6438

6539
this.LOGGER = this.plugin.getLogger();
66-
67-
COMMAND_MANAGERS.add(this);
6840
}
6941

7042
/**

‎src/main/java/me/adrigamer2950/adriapi/api/exceptions/DuplicatedManagerException.java

-11
This file was deleted.

‎src/main/java/me/adrigamer2950/adriapi/listeners/ManagersListener.java

-25
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.