From 0cd3fd31393bfa3530ccbc16b955e3036ccb76ba Mon Sep 17 00:00:00 2001
From: Cal <cwolfson58@gmail.com>
Date: Fri, 5 Apr 2024 12:08:20 +1100
Subject: fix merge

---
 src/main/java/at/hannibal2/skyhanni/utils/HolographicEntities.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/HolographicEntities.kt b/src/main/java/at/hannibal2/skyhanni/utils/HolographicEntities.kt
index 5110c40c8..74345053c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/HolographicEntities.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/HolographicEntities.kt
@@ -60,9 +60,9 @@ object HolographicEntities {
         var isChild: Boolean = false
         var lastPosition: LorenzVec = position
         var lastYaw: Float = yaw
-        val createdAt = TimeMark.now()
+        val createdAt = SimpleTimeMark.now()
 
-        val monotonicProgress get() = createdAt.passedTime().inWholeTicks
+        val monotonicProgress get() = createdAt.passedSince().inWholeTicks
 
         /**
          * Should be called exactly once per tick or never over the lifetime of this [HolographicEntity].
-- 
cgit