Fixed time until death of slayer in damage indicator to be off by one second.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index 9d20ee2b7..679c6e97c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -36,6 +36,7 @@ import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.asTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -800,7 +801,7 @@ class DamageIndicatorManager {
             entityResult.delayedStart?.asTimeMark(),
             entityResult.finalDungeonBoss,
             entityResult.bossType,
-            foundTime = System.currentTimeMillis()
+            foundTime = SimpleTimeMark.now()
         )
         DamageIndicatorDetectedEvent(entityData).postAndCatch()
         return entityData
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/EntityData.kt
index 7d8f52a74..af07242a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/EntityData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/EntityData.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.combat.damageindicator
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.TimeUnit
-import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraft.entity.EntityLivingBase
 
 class EntityData(
@@ -13,7 +13,7 @@ class EntityData(
     val finalDungeonBoss: Boolean,
     val bossType: BossType,
     val damageCounter: DamageCounter = DamageCounter(),
-    val foundTime: Long,
+    val foundTime: SimpleTimeMark,
 
     var lastHealth: Long = 0L,
     var healthText: String = "",
@@ -26,7 +26,6 @@ class EntityData(
     var deathLocation: LorenzVec? = null,
 ) {
     val timeToKill by lazy {
-        val duration = System.currentTimeMillis() - foundTime
-        "§e" + TimeUtils.formatDuration(duration, TimeUnit.SECOND, showMilliSeconds = true)
+        "§e" + foundTime.passedSince().format(TimeUnit.SECOND, showMilliSeconds = true)
     }
 }