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

Fix issue with characters in login screen, maybe.

Browse source
This commit is contained in:
Ottermandias 2024-10-30 17:31:38 +01:00
parent 7e6ea5008c
commit 2358eb378d
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Penumbra/Interop/PathResolving/CollectionResolver.cs
View file

@ -1,6 +1,7 @@
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using OtterGui;
using OtterGui.Services; using OtterGui.Services;
using Penumbra.Collections; using Penumbra.Collections;
using Penumbra.Collections.Manager; using Penumbra.Collections.Manager;
@ -62,10 +63,11 @@ public sealed unsafe class CollectionResolver(
try try
{ {
if (useCache && cache.TryGetValue(gameObject, out var data)) // Login screen reuses the same actors and can not be cached.
if (LoginScreen(gameObject, out var data))
return data; return data;
if (LoginScreen(gameObject, out data)) if (useCache && cache.TryGetValue(gameObject, out data))
return data; return data;
if (Aesthetician(gameObject, out data)) if (Aesthetician(gameObject, out data))
@ -116,16 +118,17 @@ public sealed unsafe class CollectionResolver(
return true; return true;
} }
var notYetReady = false; var notYetReady = false;
var lobby = AgentLobby.Instance(); var lobby = AgentLobby.Instance();
if (lobby != null) var characterList = CharaSelectCharacterList.Instance();
if (lobby != null && characterList != null)
{ {
var span = lobby->LobbyData.CharaSelectEntries.AsSpan();
// The lobby uses the first 8 cutscene actors. // The lobby uses the first 8 cutscene actors.
var idx = gameObject->ObjectIndex - ObjectIndex.CutsceneStart.Index; var idx = gameObject->ObjectIndex - ObjectIndex.CutsceneStart.Index;
if (idx >= 0 && idx < span.Length && span[idx].Value != null) if (characterList->CharacterMapping.FindFirst(m => m.ClientObjectIndex == idx, out var mapping)
&& lobby->LobbyData.CharaSelectEntries.FindFirst(e => e.Value->ContentId == mapping.ContentId, out var charaEntry))
{ {
var item = span[idx].Value; var item = charaEntry.Value;
var identifier = actors.CreatePlayer(new ByteString(item->Name), item->HomeWorldId); var identifier = actors.CreatePlayer(new ByteString(item->Name), item->HomeWorldId);
Penumbra.Log.Verbose( Penumbra.Log.Verbose(
$"Identified {identifier.Incognito(null)} in cutscene for actor {idx + 200} at 0x{(ulong)gameObject:X} of race {(gameObject->IsCharacter() ? ((Character*)gameObject)->DrawData.CustomizeData.Race.ToString() : "Unknown")}."); $"Identified {identifier.Incognito(null)} in cutscene for actor {idx + 200} at 0x{(ulong)gameObject:X} of race {(gameObject->IsCharacter() ? ((Character*)gameObject)->DrawData.CustomizeData.Race.ToString() : "Unknown")}.");
@ -141,7 +144,7 @@ public sealed unsafe class CollectionResolver(
var collection = collectionManager.Active.ByType(CollectionType.Yourself) var collection = collectionManager.Active.ByType(CollectionType.Yourself)
?? CollectionByAttributes(gameObject, ref notYetReady) ?? CollectionByAttributes(gameObject, ref notYetReady)
?? collectionManager.Active.Default; ?? collectionManager.Active.Default;
ret = notYetReady ? collection.ToResolveData(gameObject) : cache.Set(collection, ActorIdentifier.Invalid, gameObject); ret = collection.ToResolveData(gameObject);
return true; return true;
} }