fix: change ClientState.

ArchiDog1998 · May 18, 2023 · a411c7e · a411c7e
1 parent c6b2185
commit a411c7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/RotationSolver.Basic/Service.cs b/RotationSolver.Basic/Service.cs
@@ -109,9 +109,6 @@ public unsafe static IEnumerable<IntPtr> GetAddons<T>() where T : struct
             .Where(ptr => ptr != IntPtr.Zero);
     }
 
-    [PluginService]
-    public static ClientState ClientState { get; set; }
-
     public static ExcelSheet<T> GetSheet<T>() where T : ExcelRow => DataManager.GetExcelSheet<T>();
 
     internal static TextureWrap GetTextureIcon(uint id) => DataManager.GetImGuiTextureIcon(id);
@@ -156,6 +153,6 @@ public unsafe static IEnumerable<IntPtr> GetAddons<T>() where T : struct
     [PluginService]
     public static DutyState DutyState { get; private set; }
 
-    public static ClientLanguage Language => ClientState.ClientLanguage;
+    public static ClientLanguage Language => Svc.ClientState.ClientLanguage;
 
 }
diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -62,7 +62,7 @@ internal static void Enable()
         Service.DutyState.DutyStarted += DutyState_DutyStarted;
         Service.DutyState.DutyWiped += DutyState_DutyWiped;
         Service.DutyState.DutyCompleted += DutyState_DutyCompleted;
-        Service.ClientState.TerritoryChanged += ClientState_TerritoryChanged;
+        Svc.ClientState.TerritoryChanged += ClientState_TerritoryChanged;
 
         HighEndDuties = Service.GetSheet<TerritoryType>()
             .Where(t => t?.ContentFinderCondition?.Value?.HighEndDuty ?? false)
@@ -146,7 +146,7 @@ internal static void Disable()
         Service.DutyState.DutyStarted -= DutyState_DutyStarted;
         Service.DutyState.DutyWiped -= DutyState_DutyWiped;
         Service.DutyState.DutyCompleted -= DutyState_DutyCompleted;
-        Service.ClientState.TerritoryChanged -= ClientState_TerritoryChanged;
+        Svc.ClientState.TerritoryChanged -= ClientState_TerritoryChanged;
     }
 
     static RandomDelay socialDelay = new(() => (3, 5));

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -121,7 +121,7 @@ private static IEnumerable<BattleChara> GetHostileTargets(IEnumerable<BattleChar
         allAttackableTargets = allAttackableTargets.Where(b =>
         {
             IEnumerable<string> names = Array.Empty<string>();
-            if(OtherConfiguration.NoHostileNames.TryGetValue(Service.ClientState.TerritoryType, out var ns1))
+            if(OtherConfiguration.NoHostileNames.TryGetValue(Svc.ClientState.TerritoryType, out var ns1))
                 names = names.Union(ns1);
 
             if (OtherConfiguration.NoHostileNames.TryGetValue(0, out var ns2))