From 3f91a19a477843d3aac971ae67c3a2c0c26780c0 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 12 May 2023 16:36:28 +0200
Subject: Changed Warp to Trapper Hotkey to only work while in the Farming
 Islands

---
 src/main/java/at/hannibal2/skyhanni/config/features/Misc.java           | 2 +-
 .../java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index fdcd643d9..afb351c9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -326,7 +326,7 @@ public class Misc {
         public boolean trapperMobDiedMessage = true;
 
         @Expose
-        @ConfigOption(name = "Warp to Trapper", desc = "Warp to Trevor's Den.")
+        @ConfigOption(name = "Warp to Trapper", desc = "Warp to Trevor's Den. Works only inside the Farming Islands.")
         @ConfigEditorBoolean
         public boolean warpToTrapper = false;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
index 7280ae4bf..9a2209ab3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
@@ -196,6 +196,7 @@ class TrevorFeatures {
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
         if (!config.warpToTrapper) return
+        if (!onFarmingIsland()) return
         if (!Keyboard.getEventKeyState()) return
         val key = if (Keyboard.getEventKey() == 0) Keyboard.getEventCharacter().code + 256 else Keyboard.getEventKey()
         if (config.keyBindWarpTrapper != key) return
-- 
cgit