code fixes

martimavocado · Oct 9, 2024 · e4fca94 · e4fca94
1 parent f6b340d
commit e4fca94
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonPhaseChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonPhaseChangeEvent.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 
-class DungeonPhaseChangeEvent(val newPhase: DungeonAPI.DungeonPhase) : LorenzEvent()
+class DungeonPhaseChangeEvent(val newPhase: DungeonAPI.DungeonPhase) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -509,7 +509,7 @@ object DungeonAPI {
     }
 
     private fun changePhase(newPhase: DungeonPhase) {
-        DungeonPhaseChangeEvent(newPhase)
+        DungeonPhaseChangeEvent(newPhase).post()
         dungeonPhase = newPhase
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
@@ -16,20 +16,19 @@ object TerracottaPhase {
 
     @SubscribeEvent(priority = EventPriority.HIGH)
     fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityLivingBase>) {
-        if (isActive() && config.hideDamageSplash && DamageIndicatorManager.isDamageSplash(event.entity)) {
+        if (isEnabled() && config.hideDamageSplash && DamageIndicatorManager.isDamageSplash(event.entity)) {
             event.cancel()
         }
     }
 
     @SubscribeEvent
     fun onReceiveParticle(event: ReceiveParticleEvent) {
-        if (isActive() && config.hideParticles) {
+        if (isEnabled() && config.hideParticles) {
             event.cancel()
         }
     }
 
-    private fun isActive() = isEnabled() && DungeonAPI.dungeonPhase == DungeonAPI.DungeonPhase.F6_TERRACOTTA
-
     private fun isEnabled() =
-        DungeonAPI.inDungeon() && DungeonAPI.inBossRoom && DungeonAPI.getCurrentBoss() == DungeonFloor.F6
+        DungeonAPI.inDungeon() && DungeonAPI.inBossRoom && DungeonAPI.getCurrentBoss() == DungeonFloor.F6 &&
+            DungeonAPI.dungeonPhase == DungeonAPI.DungeonPhase.F6_TERRACOTTA
 }