From ed7b454625e44622eb1d8b4521e27474b97ef3ed Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sun, 26 Jun 2022 13:34:14 +0200 Subject: [PATCH] Fix Exception when calling #emergencyStop inside onPluginEnable --- Core/src/main/java/com/songoda/core/SongodaPlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/SongodaPlugin.java b/Core/src/main/java/com/songoda/core/SongodaPlugin.java index 16f76884..2050843d 100644 --- a/Core/src/main/java/com/songoda/core/SongodaPlugin.java +++ b/Core/src/main/java/com/songoda/core/SongodaPlugin.java @@ -48,7 +48,7 @@ public abstract class SongodaPlugin extends JavaPlugin { *
* Do not include language files if you are using the Core's localization system. */ - public abstract List getConfigs(); + public abstract @NotNull List getConfigs(); @Override public final void onLoad() { @@ -82,6 +82,10 @@ public abstract class SongodaPlugin extends JavaPlugin { // plugin setup onPluginEnable(); + if (this.emergencyStop) { + return; + } + // Load Data. Bukkit.getScheduler().runTaskLater(this, this::onDataLoad, this.dataLoadDelay); @@ -205,7 +209,7 @@ public abstract class SongodaPlugin extends JavaPlugin { protected void criticalErrorOnPluginStartup(Throwable th) { Bukkit.getLogger().log(Level.SEVERE, String.format( - "Unexpected error while loading %s v%s c%s: Disabling plugin!", + "Unexpected error while loading %s v%s (core v%s): Disabling plugin!", getDescription().getName(), getDescription().getVersion(), SongodaCore.getCoreLibraryVersion()