Unregister listener if disabled #36

SrBedrock · Sep 27, 2023 · 0f2e73e · 0f2e73e
2 parents aaccaff + 48a5dc5
commit 0f2e73e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.armamc"
-version = "1.1.0"
+version = "1.1.1"
 
 repositories {
  mavenCentral()

diff --git a/src/main/java/com/armamc/plugincontrol/commands/subcommands/DisableSubCommand.java b/src/main/java/com/armamc/plugincontrol/commands/subcommands/DisableSubCommand.java
@@ -3,6 +3,7 @@
 import com.armamc.plugincontrol.PluginControl;
 import com.armamc.plugincontrol.managers.ConfigManager;
 import com.armamc.plugincontrol.managers.MessageManager;
+import com.armamc.plugincontrol.managers.PluginsManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -12,15 +13,18 @@
 public class DisableSubCommand implements SubCommand {
  private final ConfigManager config;
  private final MessageManager message;
+ private final PluginsManager manager;
 
  public DisableSubCommand(@NotNull PluginControl plugin) {
  this.config = plugin.getConfigManager();
  this.message = plugin.getMessageManager();
+ this.manager = plugin.getPluginsManager();
  }
 
  @Override
  public void execute(CommandSender sender, Command command, String label, String[] args) {
  config.setEnabled(false);
+ manager.unregisterListener();
  message.send(sender, message.getPluginDisabled());
  }
 

diff --git a/src/main/java/com/armamc/plugincontrol/commands/subcommands/EnableSubCommand.java b/src/main/java/com/armamc/plugincontrol/commands/subcommands/EnableSubCommand.java
@@ -3,6 +3,7 @@
 import com.armamc.plugincontrol.PluginControl;
 import com.armamc.plugincontrol.managers.ConfigManager;
 import com.armamc.plugincontrol.managers.MessageManager;
+import com.armamc.plugincontrol.managers.PluginsManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Contract;
@@ -13,16 +14,19 @@
 public class EnableSubCommand implements SubCommand {
  private final ConfigManager config;
  private final MessageManager message;
+ private final PluginsManager manager;
 
  @Contract(pure = true)
  public EnableSubCommand(@NotNull PluginControl plugin) {
  this.config = plugin.getConfigManager();
  this.message = plugin.getMessageManager();
+ this.manager = plugin.getPluginsManager();
  }
 
  @Override
  public void execute(CommandSender sender, Command command, String label, String[] args) {
  config.setEnabled(true);
+ manager.checkPlugins();
  message.send(sender, message.getPluginEnabled());
  }
 

diff --git a/src/main/java/com/armamc/plugincontrol/commands/subcommands/ToggleSubCommand.java b/src/main/java/com/armamc/plugincontrol/commands/subcommands/ToggleSubCommand.java
@@ -3,6 +3,7 @@
 import com.armamc.plugincontrol.PluginControl;
 import com.armamc.plugincontrol.managers.ConfigManager;
 import com.armamc.plugincontrol.managers.MessageManager;
+import com.armamc.plugincontrol.managers.PluginsManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Contract;
@@ -13,19 +14,23 @@
 public class ToggleSubCommand implements SubCommand {
  private final ConfigManager config;
  private final MessageManager message;
+ private final PluginsManager manager;
 
  @Contract(pure = true)
  public ToggleSubCommand(@NotNull PluginControl plugin) {
  this.config = plugin.getConfigManager();
  this.message = plugin.getMessageManager();
+ this.manager = plugin.getPluginsManager();
  }
 
  @Override
  public void execute(CommandSender sender, Command command, String label, String[] args) {
  config.setEnabled(!config.isEnabled());
  if (config.isEnabled()) {
+ manager.checkPlugins();
  message.send(sender, message.getPluginEnabled());
  } else {
+ manager.unregisterListener();
  message.send(sender, message.getPluginDisabled());
  }
  }

diff --git a/src/main/java/com/armamc/plugincontrol/listeners/PlayerListener.java b/src/main/java/com/armamc/plugincontrol/listeners/PlayerListener.java
@@ -31,6 +31,7 @@ public void init() {
 
  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
  private void onPlayerLogin(@NotNull PlayerLoginEvent event) {
+ if (!plugin.getConfigManager().isEnabled()) return;
  if (event.getPlayer().hasPermission(bypass)) return;
  event.disallow(PlayerLoginEvent.Result.KICK_OTHER, message.serialize(message.getKickMessage()));
  }