From 3b54485127dcbee68733d9eb5a5027c90e552619 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 5 Apr 2025 14:42:25 +0200
Subject: [PATCH] Maybe fix AtchCaller crashes.

---
 Penumbra/Interop/Hooks/Meta/AtchCallerHook1.cs       | 2 +-
 Penumbra/Interop/PathResolving/CollectionResolver.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Penumbra/Interop/Hooks/Meta/AtchCallerHook1.cs b/Penumbra/Interop/Hooks/Meta/AtchCallerHook1.cs
index c350c157..2a3d7468 100644
--- a/Penumbra/Interop/Hooks/Meta/AtchCallerHook1.cs
+++ b/Penumbra/Interop/Hooks/Meta/AtchCallerHook1.cs
@@ -25,7 +25,7 @@ public unsafe class AtchCallerHook1 : FastHook<AtchCallerHook1.Delegate>, IDispo
 
     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);
         Task.Result.Original(data, slot, unk, playerModel);
         _metaState.AtchCollection.Pop();
diff --git a/Penumbra/Interop/PathResolving/CollectionResolver.cs b/Penumbra/Interop/PathResolving/CollectionResolver.cs
index 576b61bb..f14abbff 100644
--- a/Penumbra/Interop/PathResolving/CollectionResolver.cs
+++ b/Penumbra/Interop/PathResolving/CollectionResolver.cs
@@ -95,6 +95,10 @@ public sealed unsafe class CollectionResolver(
         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>
     public bool IsModelHuman(uint modelCharaId)
         => humanModels.IsHuman(modelCharaId);