Skip disabling if core failed to initialize

Otherwise this will cause a NullPointerException.
Minecrell · Apr 23, 2023 · 75cf5cf · 75cf5cf
1 parent fc195b4
commit 75cf5cf
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/BukkitPlugin.java b/Bukkit/src/main/java/net/minecrell/serverlistplus/bukkit/BukkitPlugin.java
@@ -177,6 +177,7 @@ public void onEnable() {
 
  @Override
  public void onDisable() {
+ if (core == null) return;
  try {
  core.stop();
  } catch (ServerListPlusException ignored) {}

diff --git a/Bungee/src/main/java/net/minecrell/serverlistplus/bungee/BungeePlugin.java b/Bungee/src/main/java/net/minecrell/serverlistplus/bungee/BungeePlugin.java
@@ -115,6 +115,7 @@ public void onEnable() {
 
  @Override
  public void onDisable() {
+ if (core == null) return;
  try {
  core.stop();
  } catch (ServerListPlusException ignored) {}

diff --git a/Canary/src/main/java/net/minecrell/serverlistplus/canary/CanaryPlugin.java b/Canary/src/main/java/net/minecrell/serverlistplus/canary/CanaryPlugin.java
@@ -135,6 +135,7 @@ public boolean enable() {
 
  @Override
  public void disable() {
+ if (core == null) return;
  try {
  core.stop();
  } catch (ServerListPlusException ignored) {}

diff --git a/Sponge/src/main/java/net/minecrell/serverlistplus/sponge/SpongePlugin.java b/Sponge/src/main/java/net/minecrell/serverlistplus/sponge/SpongePlugin.java
@@ -130,6 +130,7 @@ public void registerCommand(RegisterCommandEvent<Command.Raw> event) {
 
  @Listener
  public void stop(StoppedGameEvent event) {
+ if (core == null) return;
  try {
  core.stop();
  } catch (ServerListPlusException ignored) {}

diff --git a/Velocity/src/main/java/net/minecrell/serverlistplus/velocity/VelocityPlugin.java b/Velocity/src/main/java/net/minecrell/serverlistplus/velocity/VelocityPlugin.java
@@ -114,6 +114,7 @@ public void initialize(ProxyInitializeEvent event) {
 
  @Subscribe
  public void shutdown(ProxyShutdownEvent event) {
+ if (core == null) return;
  try {
  core.stop();
  } catch (ServerListPlusException ignored) {}