From ad3cb3a620e09f1b8cc76976ee46294aed651f31 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 16 Feb 2022 16:48:40 +0000
Subject: [PATCH] Fixed postInit

---
 .../willfp/eco/internal/spigot/EcoSpigotPlugin.kt |  2 ++
 .../eco/internal/spigot/data/EcoProfileHandler.kt |  4 ++++
 .../internal/spigot/data/storage/DataHandler.kt   |  7 ++++---
 .../spigot/data/storage/MySQLDataHandler.kt       | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt
index 2fc3f9ae..26e9675e 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt
@@ -48,6 +48,7 @@ import com.willfp.eco.internal.items.ArgParserUnbreakable
 import com.willfp.eco.internal.spigot.arrows.ArrowDataListener
 import com.willfp.eco.internal.spigot.data.DataListener
 import com.willfp.eco.internal.spigot.data.DataYml
+import com.willfp.eco.internal.spigot.data.EcoProfileHandler
 import com.willfp.eco.internal.spigot.data.PlayerBlockListener
 import com.willfp.eco.internal.spigot.data.storage.ProfileSaver
 import com.willfp.eco.internal.spigot.display.PacketAutoRecipe
@@ -215,6 +216,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
         CustomItemsManager.registerAllItems()
         CustomEntitiesManager.registerAllEntities()
         ShopManager.registerEcoProvider()
+        (Eco.getHandler().profileHandler as EcoProfileHandler).runPostInit()
     }
 
     override fun loadIntegrationLoaders(): List<IntegrationLoader> {
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt
index d439cc86..2ae5bb91 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfileHandler.kt
@@ -63,4 +63,8 @@ class EcoProfileHandler(
     override fun save() {
         handler.save()
     }
+
+    fun runPostInit() {
+        handler.runPostInit()
+    }
 }
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt
index c923102d..6bf177ee 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/DataHandler.kt
@@ -5,12 +5,13 @@ import org.bukkit.NamespacedKey
 import java.util.UUID
 
 interface DataHandler {
-    fun save() {
+    fun save()
+    fun saveAll(uuids: Iterable<UUID>)
+
+    fun runPostInit() {
 
     }
 
-    fun saveAll(uuids: Iterable<UUID>)
-
     fun savePlayer(uuid: UUID) {
         saveKeysFor(uuid, PersistentDataKey.values())
     }
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt
index e14ad292..d414803d 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/storage/MySQLDataHandler.kt
@@ -95,6 +95,11 @@ class MySQLDataHandler(
         )
         plugin.dataYml.save()
     }
+
+    override fun runPostInit() {
+        playerHandler.runPostInit()
+        serverHandler.runPostInit()
+    }
 }
 
 @Suppress("UNCHECKED_CAST")
@@ -102,7 +107,7 @@ private class ImplementedMySQLHandler(
     private val handler: EcoProfileHandler,
     private val table: UUIDTable,
     plugin: EcoPlugin,
-    knownKeys: Collection<NamespacedKey>
+    private val knownKeys: Collection<NamespacedKey>
 ) {
     private val columns = mutableMapOf<String, Column<*>>()
     private val threadFactory = ThreadFactoryBuilder().setNameFormat("eco-mysql-thread-%d").build()
@@ -136,11 +141,11 @@ private class ImplementedMySQLHandler(
                     }
                 }
         }
+    }
 
-        plugin.scheduler.runLater(1) {
-            for (key in knownKeys) {
-                ensureKeyRegistration(key)
-            }
+    fun runPostInit() {
+        for (key in knownKeys) {
+            ensureKeyRegistration(key)
         }
     }