From 8ffaee3d5124168731f6500fc6e796c649d8937b Mon Sep 17 00:00:00 2001
From: Jakob K <bluefireolymp@gmail.com>
Date: Tue, 15 Jun 2021 20:06:57 +0200
Subject: [PATCH] Change isInitialized check

---
 .../kotlin/net/axay/kspigot/main/KSpigot.kt   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt b/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
index e979adab..b93e0707 100644
--- a/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
+++ b/src/main/kotlin/net/axay/kspigot/main/KSpigot.kt
@@ -7,6 +7,12 @@ import net.axay.kspigot.languageextensions.kotlinextensions.closeIfInitialized
 import net.axay.kspigot.runnables.KRunnableHolder
 import org.bukkit.plugin.java.JavaPlugin
 
+/**
+ * The main plugin instance.
+ */
+lateinit var KSpigotMainInstance: KSpigot
+    private set
+
 /**
  * This is the main instance of KSpigot.
  *
@@ -43,7 +49,10 @@ abstract class KSpigot : JavaPlugin() {
     open fun shutdown() {}
 
     final override fun onLoad() {
-        internalMainInstance = this
+        if (::KSpigotMainInstance.isInitialized) {
+            console.warn("The main instance of KSpigot has been modified, even though it has already been set by another plugin!")
+        }
+        KSpigotMainInstance = this
         load()
     }
 
@@ -58,13 +67,3 @@ abstract class KSpigot : JavaPlugin() {
         guiHolderProperty.closeIfInitialized()
     }
 }
-
-private var internalMainInstance: KSpigot? = null
-    set(value) {
-        if (field != null) {
-            console.warn("The main instance of KSpigot has been modified, even though it has already been set by another plugin!")
-        }
-        field = value
-    }
-
-val KSpigotMainInstance = internalMainInstance!!