From 81eb5582cf4c1d61b91ea65c8c06a09f66b43f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Thu, 18 May 2023 20:34:28 +0800 Subject: [PATCH] fix: remove partyList. --- ECommons | 2 +- RotationSolver.Basic/Service.cs | 6 ------ RotationSolver/Updaters/PreviewUpdater.cs | 2 +- RotationSolver/Updaters/TargetUpdater.cs | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ECommons b/ECommons index ce974d0f1..53ccfb184 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit ce974d0f1c80b27895e8ec986f02cc30634801df +Subproject commit 53ccfb184b52edb2318da7c1c77fc00d99425dd2 diff --git a/RotationSolver.Basic/Service.cs b/RotationSolver.Basic/Service.cs index 25a1177a1..7011c7856 100644 --- a/RotationSolver.Basic/Service.cs +++ b/RotationSolver.Basic/Service.cs @@ -120,12 +120,6 @@ public unsafe static IEnumerable GetAddons() where T : struct [PluginService] public static TargetManager TargetManager { get; private set; } - [PluginService] - public static PartyList PartyList { get; private set; } - - [PluginService] - public static DtrBar DtrBar { get; private set; } - [PluginService] public static ToastGui ToastGui { get; private set; } [PluginService] diff --git a/RotationSolver/Updaters/PreviewUpdater.cs b/RotationSolver/Updaters/PreviewUpdater.cs index e6f70ec2b..a92213378 100644 --- a/RotationSolver/Updaters/PreviewUpdater.cs +++ b/RotationSolver/Updaters/PreviewUpdater.cs @@ -34,7 +34,7 @@ private static void UpdateEntry() { try { - _dtrEntry ??= Service.DtrBar.Get("Rotation Solver"); + _dtrEntry ??= Svc.DtrBar.Get("Rotation Solver"); } catch { diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs index 5d519207f..271dbd9fb 100644 --- a/RotationSolver/Updaters/TargetUpdater.cs +++ b/RotationSolver/Updaters/TargetUpdater.cs @@ -308,7 +308,7 @@ private static float GetPartyMemberHPRatio(BattleChara member) private static IEnumerable GetPartyMembers(IEnumerable allTargets) { - var party = Service.PartyList.Select(p => p.GameObject).OfType().Where(b => b.DistanceToPlayer() <= 30); + var party = Svc.Party.Select(p => p.GameObject).OfType().Where(b => b.DistanceToPlayer() <= 30); if (!party.Any()) party = new BattleChara[] { Player.Object };