ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-30 20:33:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to resolve banner players better.

Browse source
This commit is contained in:
Ottermandias 2023-01-16 13:03:26 +01:00
parent 4059e0630a
commit 123ed256b1
3 changed files with 119 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Penumbra/Interop/Resolver/PathResolver.Identification.cs
View file

@ -88,12 +88,6 @@ public unsafe partial class PathResolver
return IdentifiedCache.Set( collection2, ActorIdentifier.Invalid, gameObject );
}
// Mahjong special case.
if( Dalamud.ClientState.TerritoryType == 831 )
{
return IdentifyMahjong( gameObject );
}
// Aesthetician. The relevant actor is yourself, so use player collection when possible.
if( Dalamud.GameGui.GetAddonByName( "ScreenLog", 1 ) == IntPtr.Zero )
{
@ -106,12 +100,16 @@ public unsafe partial class PathResolver
}
var identifier = Penumbra.Actors.FromObject( gameObject, out var owner, true, false );
if( Penumbra.Config.UseNoModsInInspect && identifier.Type == IdentifierType.Special && identifier.Special == ScreenActor.ExamineScreen )
if( identifier.Type is IdentifierType.Special )
{
return IdentifiedCache.Set( ModCollection.Empty, identifier, gameObject );
if( Penumbra.Config.UseNoModsInInspect && identifier.Special == ScreenActor.ExamineScreen )
{
return IdentifiedCache.Set( ModCollection.Empty, identifier, gameObject );
}
identifier = Penumbra.CollectionManager.Individuals.ConvertSpecialIdentifier( identifier );
}
identifier = Penumbra.CollectionManager.Individuals.ConvertSpecialIdentifier( identifier );
var collection = CollectionByIdentifier( identifier )
?? CheckYourself( identifier, gameObject )
?? CollectionByAttributes( gameObject )