Fix: Time Tower usage warnings sending excessively (#2751)

Co-authored-by: calwolfson <[email protected]>
hannibal002 · Oct 18, 2024 · 33a9608 · 33a9608
1 parent df28fc4
commit 33a9608
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...annibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt b/...annibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTimeTowerManager.kt
@@ -22,7 +22,7 @@ object ChocolateFactoryTimeTowerManager {
     private val profileStorage get() = ChocolateFactoryAPI.profileStorage
 
     private var lastTimeTowerWarning = SimpleTimeMark.farPast()
-    private var warnedAboutLatestCharge = false
+    private var warnAboutNewCharge = false
     private var wasTimeTowerRecentlyActive = false
 
     @SubscribeEvent
@@ -53,13 +53,13 @@ object ChocolateFactoryTimeTowerManager {
                 profileStorage.currentTimeTowerUses++
                 nextCharge += ChocolateFactoryAPI.timeTowerChargeDuration()
                 profileStorage.nextTimeTower = nextCharge
-                warnedAboutLatestCharge = false
+                warnAboutNewCharge = true
             }
         }
 
-        if (currentCharges() < maxCharges()) {
+        if (currentCharges() > 0 && currentCharges() < maxCharges()) {
             if (!config.timeTowerWarning || timeTowerActive()) return
-            if (warnedAboutLatestCharge) return
+            if (!warnAboutNewCharge) return
             ChatUtils.clickableChat(
                 "Your Time Tower has an available charge §7(${timeTowerCharges()})§e. " +
                     "Click here to use one.",
@@ -68,7 +68,7 @@ object ChocolateFactoryTimeTowerManager {
             )
             SoundUtils.playBeepSound()
             lastTimeTowerWarning = SimpleTimeMark.now()
-            warnedAboutLatestCharge = true
+            warnAboutNewCharge = false
         }
         checkTimeTowerWarning(false)
     }