From cf8b56c0f4b679548ad682d50e68952322e81abd Mon Sep 17 00:00:00 2001
From: Zerken <jerkyyjoshh@gmail.com>
Date: Fri, 4 Aug 2023 07:12:34 +0000
Subject: [PATCH] Fixed enchanted lyre teleport bypassing teleblock

---
 .../quest/thefremenniktrials/TFTInteractionListeners.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt
index 1ed6dfa9d..ec7ce8381 100644
--- a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt
+++ b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt
@@ -171,12 +171,12 @@ class TFTInteractionListeners : InteractionListener {
                 sendMessage(player,"You lack the knowledge to play this.")
             } else if(LYRE_IDs.isLast(lyre.id)){
                 sendMessage(player,"Your lyre is out of charges!")
-            } else {
-                if(removeItem(player,lyre.asItem())){
+            } else if (player.isTeleBlocked) {
+                    sendMessage(player, "A magical force has stopped you from teleporting.")
+            } else if(removeItem(player,lyre.asItem())){
                     addItem(player,LYRE_IDs.getNext(lyre.id))
                     Pulser.submit(TelePulse(player))
                 }
-            }
             return@on true
         }