muffin v7.4.19
This commit is contained in:
parent
f82b9ce2a2
commit
afafd5e377
9 changed files with 896 additions and 796 deletions
|
|
@ -28,6 +28,8 @@ internal sealed class AutomatonIpc : IDisposable
|
|||
|
||||
private readonly FateController _fateController;
|
||||
|
||||
private readonly SeasonalDutyController _seasonalDutyController;
|
||||
|
||||
private readonly TerritoryData _territoryData;
|
||||
|
||||
private readonly IClientState _clientState;
|
||||
|
|
@ -44,11 +46,12 @@ internal sealed class AutomatonIpc : IDisposable
|
|||
|
||||
private bool _wasFateRunning;
|
||||
|
||||
public AutomatonIpc(Configuration configuration, IDalamudPluginInterface pluginInterface, QuestController questController, FateController fateController, TerritoryData territoryData, IClientState clientState, IFramework framework, ILogger<AutomatonIpc> logger)
|
||||
public AutomatonIpc(Configuration configuration, IDalamudPluginInterface pluginInterface, QuestController questController, FateController fateController, SeasonalDutyController seasonalDutyController, TerritoryData territoryData, IClientState clientState, IFramework framework, ILogger<AutomatonIpc> logger)
|
||||
{
|
||||
_configuration = configuration;
|
||||
_questController = questController;
|
||||
_fateController = fateController;
|
||||
_seasonalDutyController = seasonalDutyController;
|
||||
_territoryData = territoryData;
|
||||
_clientState = clientState;
|
||||
_framework = framework;
|
||||
|
|
@ -65,7 +68,7 @@ internal sealed class AutomatonIpc : IDisposable
|
|||
{
|
||||
Task.Run((Action)DisableConflictingTweaks);
|
||||
}
|
||||
else if (!_fateController.IsRunning)
|
||||
else if (!_fateController.IsRunning && !_seasonalDutyController.IsRunning)
|
||||
{
|
||||
Task.Run((Action)RestoreConflictingTweaks);
|
||||
}
|
||||
|
|
@ -73,11 +76,11 @@ internal sealed class AutomatonIpc : IDisposable
|
|||
|
||||
private void OnFrameworkUpdate(IFramework framework)
|
||||
{
|
||||
bool isRunning = _fateController.IsRunning;
|
||||
if (isRunning != _wasFateRunning)
|
||||
bool flag = _fateController.IsRunning || _seasonalDutyController.IsRunning;
|
||||
if (flag != _wasFateRunning)
|
||||
{
|
||||
_wasFateRunning = isRunning;
|
||||
if (isRunning && !_territoryData.IsDutyInstance(_clientState.TerritoryType))
|
||||
_wasFateRunning = flag;
|
||||
if (flag && !_territoryData.IsDutyInstance(_clientState.TerritoryType))
|
||||
{
|
||||
Task.Run((Action)DisableConflictingTweaks);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue