From cc6f0ef9c93d080dde1cd2d26e9ada89016d5e01 Mon Sep 17 00:00:00 2001
From: Xaver-DaRed <xaver.entropia@gmail.com>
Date: Sat, 31 Jan 2026 22:14:52 +0100
Subject: [PATCH] Fix Grand palace teleporters not wiping enmity

---
 scripts/zones/Grand_Palace_of_HuXzoi/Zone.lua | 10 ++++------
 scripts/zones/The_Garden_of_RuHmet/Zone.lua   |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/Zone.lua b/scripts/zones/Grand_Palace_of_HuXzoi/Zone.lua
index 8005c229901..a3805f80907 100644
--- a/scripts/zones/Grand_Palace_of_HuXzoi/Zone.lua
+++ b/scripts/zones/Grand_Palace_of_HuXzoi/Zone.lua
@@ -36,8 +36,6 @@ zoneObject.onZoneIn = function(player, prevZone)
         player:setPos(-20, -1.5, -355.482, 192)
     end
 
-    player:setCharVar('Hu-Xzoi-TP', 0)
-
     return cs
 end
 
@@ -50,11 +48,11 @@ end
 
 zoneObject.onTriggerAreaEnter = function(player, triggerArea)
     if
-        player:getLocalVar('Hu-Xzoi-TP') == 0 and
+        player:getLocalVar('isTeleporting') == 0 and
         player:getAnimation() == xi.anim.NONE
     then
         -- prevent 2cs at same time
-        player:startEvent(149 + triggerArea:getTriggerAreaID())
+        player:startOptionalCutscene(149 + triggerArea:getTriggerAreaID()) -- Confirmed to wipe enmity.
     end
 end
 
@@ -63,13 +61,13 @@ end
 
 zoneObject.onEventUpdate = function(player, csid, option, npc)
     if csid >= 150 and csid <= 159 then
-        player:setLocalVar('Hu-Xzoi-TP', 1)
+        player:setLocalVar('isTeleporting', 1)
     end
 end
 
 zoneObject.onEventFinish = function(player, csid, option, npc)
     if csid >= 150 and csid <= 159 then
-        player:setLocalVar('Hu-Xzoi-TP', 0)
+        player:setLocalVar('isTeleporting', 0)
     end
 end
 
diff --git a/scripts/zones/The_Garden_of_RuHmet/Zone.lua b/scripts/zones/The_Garden_of_RuHmet/Zone.lua
index 011460417f4..b426e0be089 100644
--- a/scripts/zones/The_Garden_of_RuHmet/Zone.lua
+++ b/scripts/zones/The_Garden_of_RuHmet/Zone.lua
@@ -192,7 +192,7 @@ zoneObject.onTriggerAreaEnter = function(player, triggerArea)
                 player:startEvent(183)
             end
         elseif teleportEventsByArea[areaId] then
-            player:startOptionalCutscene(teleportEventsByArea[areaId])
+            player:startOptionalCutscene(teleportEventsByArea[areaId]) -- Confirmed to wipe enmity.
         end
     end
 end