aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-11-01 22:36:20 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-11-01 22:36:20 +0100
commit1d4e3a54c036dd3bde950f3b505d1650160c19d6 (patch)
treed4bfe7ab4a362dad2d2dffabb8963344dba590c8 /src/main
parente3b0c5d5a0d05017a3f5e8fc8ecf17580e2c5474 (diff)
downloadskyhanni-1d4e3a54c036dd3bde950f3b505d1650160c19d6.tar.gz
skyhanni-1d4e3a54c036dd3bde950f3b505d1650160c19d6.tar.bz2
skyhanni-1d4e3a54c036dd3bde950f3b505d1650160c19d6.zip
Removed diana warp data on world switch.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt7
2 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt
index 94f609c6e..b0adea115 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt
@@ -18,7 +18,8 @@ class ConfigGuiForgeInterop : IModGuiFactory {
override fun getHandlerFor(element: RuntimeOptionCategoryElement): RuntimeOptionGuiHandler? = null
- class WrappedSkyHanniConfig(private val parent: GuiScreen) : GuiScreenElementWrapper(ConfigGuiManager.getEditorInstance()) {
+ class WrappedSkyHanniConfig(private val parent: GuiScreen) :
+ GuiScreenElementWrapper(ConfigGuiManager.getEditorInstance()) {
@Throws(IOException::class)
override fun handleKeyboardInput() {
if (Keyboard.getEventKeyState() && Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index 0810d53e7..fdb41a87a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.event.diana
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
+import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
import at.hannibal2.skyhanni.utils.LocationUtils
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.sorted
@@ -53,6 +54,12 @@ class BurrowWarpHelper {
}
}
+ @SubscribeEvent
+ fun onWorldChange(event: LorenzWorldChangeEvent) {
+ lastWarp = null
+ currentWarp = null
+ }
+
companion object {
private val config get() = SkyHanniMod.feature.event.diana
var currentWarp: WarpPoint? = null