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

Fix Player Collection identification.

Browse source
This commit is contained in:
Ottermandias 2022-12-02 17:15:24 +01:00
parent 69703ed97f
commit 2900351b9a
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.GameData/Actors/ActorManager.Data.cs
View file

@ -172,7 +172,7 @@ public sealed partial class ActorManager : IDisposable
public unsafe ActorIdentifier GetCurrentPlayer()
{
var address = (Character*)(_objects[0]?.Address ?? IntPtr.Zero);
var address = (Character*)_objects.GetObjectAddress(0);
return address == null
? ActorIdentifier.Invalid
: CreateIndividualUnchecked(IdentifierType.Player, new ByteString(address->GameObject.Name), address->HomeWorld,

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

@ -63,14 +63,17 @@ public unsafe partial class PathResolver
// or the default collection if no player exists.
public static ModCollection PlayerCollection()
{
var player = Penumbra.Actors.GetCurrentPlayer();
if( !player.IsValid )
var gameObject = ( GameObject* )Dalamud.Objects.GetObjectAddress( 0 );
if( gameObject == null )
{
return Penumbra.CollectionManager.Default;
return Penumbra.CollectionManager.ByType( CollectionType.Yourself )
?? Penumbra.CollectionManager.Default;
}
var player = Penumbra.Actors.GetCurrentPlayer();
return CollectionByIdentifier( player )
?? CollectionByAttributes( ( GameObject* )Dalamud.Objects[ 0 ]!.Address )
?? CheckYourself( player, gameObject )
?? CollectionByAttributes( gameObject )
?? Penumbra.CollectionManager.Default;
}