ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2443 from Haselnussbomber/auto-update-on-free-trial
Some checks are pending
Build Dalamud / Build on Windows (push) Waiting to run
Details
Build Dalamud / Check API Compatibility (push) Blocked by required conditions
Details
Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions
Details
Tag Build / Tag Build (push) Successful in 3s
Details

Browse source 
Fix systems not working on the Free Trial
This commit is contained in:
goat 2025-10-29 09:18:36 +01:00 • committed by GitHub
commit 5290e191a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/Game/ClientState/ClientState.cs
View file

@ -249,7 +249,8 @@ internal sealed class ClientState : IInternalDisposableService, IClientState
ConditionFlag.NormalConditions, ConditionFlag.NormalConditions,
ConditionFlag.Jumping, ConditionFlag.Jumping,
ConditionFlag.Mounted, ConditionFlag.Mounted,
ConditionFlag.UsingFashionAccessory]); ConditionFlag.UsingFashionAccessory,
ConditionFlag.OnFreeTrial]);
blockingFlag = blockingConditions.FirstOrDefault(); blockingFlag = blockingConditions.FirstOrDefault();
return blockingFlag == 0; return blockingFlag == 0;

7
Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs
View file

@ -491,13 +491,10 @@ internal class AutoUpdateManager : IServiceType
private bool CanUpdateOrNag() private bool CanUpdateOrNag()
{ {
var condition = Service<Condition>.Get(); var clientState = Service<ClientState>.Get();
return this.IsPluginManagerReady() && return this.IsPluginManagerReady() &&
!this.dalamudInterface.IsPluginInstallerOpen && !this.dalamudInterface.IsPluginInstallerOpen &&
condition.OnlyAny(ConditionFlag.NormalConditions, clientState.IsClientIdle();
ConditionFlag.Jumping,
ConditionFlag.Mounted,
ConditionFlag.UsingFashionAccessory);
} }
private bool IsPluginManagerReady() private bool IsPluginManagerReady()