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

Maybe fix AtchCaller crashes.

Browse source
This commit is contained in:
Ottermandias 2025-04-05 14:42:25 +02:00
parent c3b2443ab5
commit 3b54485127
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Interop/Hooks/Meta/AtchCallerHook1.cs
View file

@ -25,7 +25,7 @@ public unsafe class AtchCallerHook1 : FastHook<AtchCallerHook1.Delegate>, IDispo
private void Detour(DrawObjectData* data, uint slot, nint unk, Model playerModel) private void Detour(DrawObjectData* data, uint slot, nint unk, Model playerModel)
{ {
var collection = _collectionResolver.IdentifyCollection(playerModel.AsDrawObject, true); var collection = playerModel.Valid ? _collectionResolver.IdentifyCollection(playerModel.AsDrawObject, true) : _collectionResolver.DefaultCollection;
_metaState.AtchCollection.Push(collection); _metaState.AtchCollection.Push(collection);
Task.Result.Original(data, slot, unk, playerModel); Task.Result.Original(data, slot, unk, playerModel);
_metaState.AtchCollection.Pop(); _metaState.AtchCollection.Pop();

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

@ -95,6 +95,10 @@ public sealed unsafe class CollectionResolver(
return IdentifyCollection(obj, useCache); return IdentifyCollection(obj, useCache);
} }
/// <summary> Get the default collection. </summary>
public ResolveData DefaultCollection
=> collectionManager.Active.Default.ToResolveData();
/// <summary> Return whether the given ModelChara id refers to a human-type model. </summary> /// <summary> Return whether the given ModelChara id refers to a human-type model. </summary>
public bool IsModelHuman(uint modelCharaId) public bool IsModelHuman(uint modelCharaId)
=> humanModels.IsHuman(modelCharaId); => humanModels.IsHuman(modelCharaId);