ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 21:24:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework special actor identification again.

Browse source
This commit is contained in:
Ottermandias 2022-12-04 16:25:38 +01:00
parent 63a22198aa
commit 9af7e9d948
5 changed files with 55 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Api/PenumbraApi.cs
View file

@ -333,7 +333,7 @@ public class PenumbraApi : IDisposable, IPenumbraApi
public (string, bool) GetCharacterCollection( string characterName, ushort worldId )
{
CheckInitialized();
return Penumbra.CollectionManager.Individuals.TryGetCollection( NameToIdentifier( characterName, worldId ), out var collection, out _ )
return Penumbra.CollectionManager.Individuals.TryGetCollection( NameToIdentifier( characterName, worldId ), out var collection )
? ( collection.Name, true )
: ( Penumbra.CollectionManager.Default.Name, false );
}
@ -807,7 +807,7 @@ public class PenumbraApi : IDisposable, IPenumbraApi
{
CheckInitialized();
var identifier = NameToIdentifier( characterName, worldId );
var collection = Penumbra.TempMods.Collections.TryGetCollection( identifier, out var c, out _ )
var collection = Penumbra.TempMods.Collections.TryGetCollection( identifier, out var c )
? c
: Penumbra.CollectionManager.Individual( identifier );
var set = collection.MetaCache?.Manipulations.ToArray() ?? Array.Empty< MetaManipulation >();