From 062d91538e9519c503710e1d3bd6c895860ac68a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 24 Feb 2024 17:27:31 +0100
Subject: Properly resetting internal diana data on clearing waypoints via NPC.

---
 .../hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt  | 5 ++++-
 .../skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt    | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index 5d7971d0f..4d839fc21 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -160,6 +160,9 @@ object GriffinBurrowHelper {
         guessLocation = null
         targetLocation = null
         particleBurrows = emptyMap()
+        GriffinBurrowParticleFinder.reset()
+
+        BurrowWarpHelper.currentWarp = null
         update()
     }
 
@@ -336,7 +339,7 @@ object GriffinBurrowHelper {
         val type: BurrowType = when (strings[0].lowercase()) {
             "reset" -> {
                 resetAllData()
-                ChatUtils.chat("Manually reset all burrow waypoints.")
+                ChatUtils.chat("Manually reset all burrow data.")
                 return
             }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 9c83dfeda..99aad9022 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -22,7 +22,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
-class GriffinBurrowParticleFinder {
+object GriffinBurrowParticleFinder {
 
     private val config get() = SkyHanniMod.feature.event.diana
 
@@ -122,6 +122,10 @@ class GriffinBurrowParticleFinder {
 
     @SubscribeEvent
     fun onWorldChange(event: LorenzWorldChangeEvent) {
+        reset()
+    }
+
+    fun reset() {
         burrows.clear()
         recentlyDugParticleBurrows.clear()
     }
-- 
cgit