Npc prices will be loaded not during startup but once minecraft is fully loaded, to fix a bug with unloaded neu data

1 files changed, 13 insertions, 4 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
index ef8a812e0..85267240e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -9,8 +9,10 @@ import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
 
 class BazaarApi {
+    private var loadedNpcPriceData = false
 
     companion object {
         val holder = BazaarDataHolder()
@@ -37,6 +39,17 @@ class BazaarApi {
         inBazaarInventory = checkIfInBazaar(event)
     }
 
+
+    @SubscribeEvent
+    fun onTick(event: TickEvent.ClientTickEvent) {
+        if (event.phase != TickEvent.Phase.START) return
+
+        if (!loadedNpcPriceData) {
+            loadedNpcPriceData = true
+            holder.start()
+        }
+    }
+
     private fun checkIfInBazaar(event: InventoryOpenEvent): Boolean {
         val returnItem = event.inventorySize - 5
         for ((slot, item) in event.inventoryItems) {
@@ -68,8 +81,4 @@ class BazaarApi {
     fun onInventoryClose(event: InventoryCloseEvent) {
         inBazaarInventory = false
     }
-
-    init {
-        holder.start()
-    }
 }
\ No newline at end of file