lozy360/CustomizeTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Send IPC OnProfileUpdate when currently used template was changed in editor, fix Profile.GetActiveProfileIdOnCharacter IPC ignoring DefaultLocalPlayerProfile

Browse Source
This commit is contained in:
RisaDev
2024-11-23 19:41:42 +03:00
parent 4ee62205ff
commit e4e10e0f9a
6 changed files with 82 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CustomizePlus/Profiles/ProfileManager.cs
View File

@@ -432,7 +432,8 @@ public partial class ProfileManager : IDisposable
/// <summary>
/// Return profile by actor identifier, does not return temporary profiles.
/// </summary>
public Profile? GetProfileByActor(Actor actor, bool enabledOnly = false)
/// todo: use GetEnabledProfilesByActor
public Profile? GetActiveProfileByActor(Actor actor)
{
var actorIdentifier = actor.GetIdentifier(_actorManager);
@@ -442,14 +443,17 @@ public partial class ProfileManager : IDisposable
if (actorIdentifier.Type == IdentifierType.Owned && !actorIdentifier.IsOwnedByLocalPlayer())
return null;
var query = Profiles.Where(p => p.Characters.Any(x => x.MatchesIgnoringOwnership(actorIdentifier)) && !p.IsTemporary);
if (enabledOnly)
query = query.Where(x => x.Enabled);
var query = Profiles.Where(p => p.Characters.Any(x => x.MatchesIgnoringOwnership(actorIdentifier)) && !p.IsTemporary && p.Enabled);
var profile = query.OrderByDescending(x => x.Priority).FirstOrDefault();
if (profile == null)
if(profile == null)
{
if (DefaultLocalPlayerProfile?.Enabled == true)
return DefaultLocalPlayerProfile;
return null;
}
return profile;
}