Change isInitialized check
This commit is contained in:
@@ -7,6 +7,12 @@ import net.axay.kspigot.languageextensions.kotlinextensions.closeIfInitialized
|
|||||||
import net.axay.kspigot.runnables.KRunnableHolder
|
import net.axay.kspigot.runnables.KRunnableHolder
|
||||||
import org.bukkit.plugin.java.JavaPlugin
|
import org.bukkit.plugin.java.JavaPlugin
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The main plugin instance.
|
||||||
|
*/
|
||||||
|
lateinit var KSpigotMainInstance: KSpigot
|
||||||
|
private set
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the main instance of KSpigot.
|
* This is the main instance of KSpigot.
|
||||||
*
|
*
|
||||||
@@ -43,7 +49,10 @@ abstract class KSpigot : JavaPlugin() {
|
|||||||
open fun shutdown() {}
|
open fun shutdown() {}
|
||||||
|
|
||||||
final override fun onLoad() {
|
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()
|
load()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,13 +67,3 @@ abstract class KSpigot : JavaPlugin() {
|
|||||||
guiHolderProperty.closeIfInitialized()
|
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!!
|
|
||||||
|
Reference in New Issue
Block a user