fix: Don't use a hook for ClientState#TerritoryType

- We can just read this from the game data.
goatcorp · Nov 19, 2024 · 52ac48c · 52ac48c
1 parent d538ce6
commit 52ac48c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
@@ -105,7 +105,7 @@ private unsafe ClientState(TargetSigScanner sigScanner, Dalamud dalamud, GameLif
     public ClientLanguage ClientLanguage { get; }
 
     /// <inheritdoc/>
-    public ushort TerritoryType { get; private set; }
+    public ushort TerritoryType => this.GetCurrentTerritoryTypeId();
 
     /// <inheritdoc/>
     public unsafe uint MapId
@@ -185,7 +185,6 @@ private unsafe void SetupTerritoryTypeDetour(EventFramework* eventFramework, ush
     {
         Log.Debug("TerritoryType changed: {0}", territoryType);
 
-        this.TerritoryType = territoryType;
         this.TerritoryChanged?.InvokeSafely(territoryType);
 
         var rowRef = LuminaUtils.CreateRef<TerritoryType>(territoryType);
@@ -326,6 +325,11 @@ private void NetworkHandlersOnCfPop(ContentFinderCondition e)
     {
         this.CfPop?.InvokeSafely(e);
     }
+
+    private unsafe ushort GetCurrentTerritoryTypeId()
+    {
+        return (ushort)GameMain.Instance()->CurrentTerritoryTypeId;
+    }
 }
 
 /// <summary>