summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/event
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-07-25 04:15:38 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-07-25 04:15:38 +0200
commita2ea62c88e4b7d25b27ccfde3d4d94d39c0a419f (patch)
tree3771b517ce72fe5c9a8b7e7020d15cafdf3a36b8 /src/main/java/at/hannibal2/skyhanni/features/event
parentde61fd6bccbea2a3ceca5a0707a3176938f24ead (diff)
downloadskyhanni-a2ea62c88e4b7d25b27ccfde3d4d94d39c0a419f.tar.gz
skyhanni-a2ea62c88e4b7d25b27ccfde3d4d94d39c0a419f.tar.bz2
skyhanni-a2ea62c88e4b7d25b27ccfde3d4d94d39c0a419f.zip
We do love LorenzTickEvent now
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/event')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index ec0df954e..f013abf07 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -4,10 +4,7 @@ package at.hannibal2.skyhanni.features.event.diana
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.IslandType
import at.hannibal2.skyhanni.data.TitleUtils
-import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent
-import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
-import at.hannibal2.skyhanni.events.PacketEvent
+import at.hannibal2.skyhanni.events.*
import at.hannibal2.skyhanni.utils.*
import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
@@ -20,7 +17,6 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent
import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.InputEvent
-import net.minecraftforge.fml.common.gameevent.TickEvent
import org.lwjgl.input.Keyboard
object InquisitorWaypointShare {
@@ -36,7 +32,6 @@ object InquisitorWaypointShare {
private var lastInquisitor = -1
private var lastShareTime = 0L
private var inquisitorsNearby = emptyList<EntityOtherPlayerMP>()
- private var tick = 0
private val logger = LorenzLogger("diana/waypoints")
@@ -50,11 +45,10 @@ object InquisitorWaypointShare {
}
@SubscribeEvent
- fun onTick(event: TickEvent.ClientTickEvent) {
- if (event.phase != TickEvent.Phase.START) return
+ fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (tick++ % 60 == 0) {
+ if (event.isMod(60)) {
inquisitorsNearby = inquisitorsNearby.editCopy { removeIf { it.isDead } }
}
}