Merge pull request #179 from oorzkws/idleteleportfix

Fix idle teleporting from inside estate
FFXIV-CombatReborn · Aug 19, 2024 · 335eb7a · 335eb7a
2 parents 7815248 + 8199718
commit 335eb7a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/GatherBuddy/AutoGather/AutoGather.cs b/GatherBuddy/AutoGather/AutoGather.cs
@@ -18,6 +18,7 @@
 using GatherBuddy.Enums;
 using GatherBuddy.Interfaces;
 using Lumina.Excel.GeneratedSheets;
+using HousingManager = GatherBuddy.SeFunctions.HousingManager;
 
 namespace GatherBuddy.AutoGather
 {
@@ -32,11 +33,6 @@ public AutoGather(GatherBuddy plugin)
             _movementController                    =  new OverrideMovement();
             _soundHelper                           =  new SoundHelper();
             GatherBuddy.UptimeManager.UptimeChange += UptimeChange;
-            var territories = Svc.Data.GetExcelSheet<TerritoryType>().Where(t => t.Unknown13);
-            foreach (var territory in territories)
-            {
-                _homeTerritories.Add(territory.RowId);
-            }
         }
 
         private void UptimeChange(IGatherable obj)
@@ -49,8 +45,7 @@ private void UptimeChange(IGatherable obj)
 
         private readonly GatherBuddy _plugin;
         private readonly SoundHelper _soundHelper;
-
-        private readonly List<uint>  _homeTerritories = new List<uint>();
+
         public           TaskManager TaskManager { get; }
 
         private bool _enabled { get; set; } = false;
@@ -92,7 +87,7 @@ public void GoHome()
             if (!GatherBuddy.Config.AutoGatherConfig.GoHomeWhenIdle || !CanAct)
                 return;
 
-            if (_homeTerritories.Contains(Svc.ClientState.TerritoryType)  || Lifestream_IPCSubscriber.IsBusy())
+            if (HousingManager.IsInHousing() || Lifestream_IPCSubscriber.IsBusy())
             {
                 if (SpiritBondMax > 0 && GatherBuddy.Config.AutoGatherConfig.DoMaterialize)
                 {

diff --git a/GatherBuddy/SeFunctions/HousingManager.cs b/GatherBuddy/SeFunctions/HousingManager.cs
@@ -0,0 +1,19 @@
+using SeHousingManager = FFXIVClientStructs.FFXIV.Client.Game.HousingManager;
+
+namespace GatherBuddy.SeFunctions;
+
+public static unsafe class HousingManager
+{
+    public static bool IsInHousing()
+    {
+        var housingManager = SeHousingManager.Instance();
+        if (housingManager == null)
+            return false;
+
+        ref var housingTerritory = ref housingManager->CurrentTerritory;
+        if (housingTerritory == null)
+            return false;
+
+        return true;
+    }
+}