From 5599f12753624981a79609bbc17a283e24bd0dc6 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sun, 17 Nov 2024 14:28:33 +0100
Subject: [PATCH] Further fixes.

---
 Penumbra/Interop/Hooks/Meta/CalculateHeight.cs       | 12 ++++++------
 Penumbra/Interop/PathResolving/CollectionResolver.cs |  2 +-
 Penumbra/Interop/ResourceTree/ResourceTree.cs        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Penumbra/Interop/Hooks/Meta/CalculateHeight.cs b/Penumbra/Interop/Hooks/Meta/CalculateHeight.cs
index 327e3d1e..0e85b3ae 100644
--- a/Penumbra/Interop/Hooks/Meta/CalculateHeight.cs
+++ b/Penumbra/Interop/Hooks/Meta/CalculateHeight.cs
@@ -14,19 +14,19 @@ public sealed unsafe class CalculateHeight : FastHook<CalculateHeight.Delegate>
     {
         _collectionResolver = collectionResolver;
         _metaState          = metaState;
-        Task = hooks.CreateHook<Delegate>("Calculate Height", (nint)HeightContainer.MemberFunctionPointers.CalculateHeight, Detour,
+        Task = hooks.CreateHook<Delegate>("Calculate Height", (nint)Character.MemberFunctionPointers.CalculateHeight, Detour,
             !HookOverrides.Instance.Meta.CalculateHeight);
     }
 
-    public delegate ulong Delegate(HeightContainer* character);
+    public delegate ulong Delegate(Character* character);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    private ulong Detour(HeightContainer* container)
+    private ulong Detour(Character* character)
     {
-        var collection = _collectionResolver.IdentifyCollection((GameObject*)container->OwnerObject, true);
+        var collection = _collectionResolver.IdentifyCollection((GameObject*)character, true);
         _metaState.RspCollection.Push(collection);
-        var ret = Task.Result.Original.Invoke(container);
-        Penumbra.Log.Excessive($"[Calculate Height] Invoked on {(nint)container:X} -> {ret}.");
+        var ret = Task.Result.Original.Invoke(character);
+        Penumbra.Log.Excessive($"[Calculate Height] Invoked on {(nint)character:X} -> {ret}.");
         _metaState.RspCollection.Pop();
         return ret;
     }
diff --git a/Penumbra/Interop/PathResolving/CollectionResolver.cs b/Penumbra/Interop/PathResolving/CollectionResolver.cs
index 50088008..576b61bb 100644
--- a/Penumbra/Interop/PathResolving/CollectionResolver.cs
+++ b/Penumbra/Interop/PathResolving/CollectionResolver.cs
@@ -240,7 +240,7 @@ public sealed unsafe class CollectionResolver(
         }
 
         // Only handle human models.
-        if (!IsModelHuman((uint)actor.AsCharacter->ModelCharaId))
+        if (!IsModelHuman((uint)actor.AsCharacter->ModelContainer.ModelCharaId))
             return null;
 
         if (actor.Customize->Data[0] == 0)
diff --git a/Penumbra/Interop/ResourceTree/ResourceTree.cs b/Penumbra/Interop/ResourceTree/ResourceTree.cs
index 62f4febe..b50fc695 100644
--- a/Penumbra/Interop/ResourceTree/ResourceTree.cs
+++ b/Penumbra/Interop/ResourceTree/ResourceTree.cs
@@ -68,7 +68,7 @@ public class ResourceTree
                 Unsafe.AsPointer(ref character->DrawData.EquipmentModelIds[0]), 10),
             _ => [],
         };
-        ModelId       = character->ModelCharaId;
+        ModelId       = character->ModelContainer.ModelCharaId;
         CustomizeData = character->DrawData.CustomizeData;
         RaceCode      = human != null ? (GenderRace)human->RaceSexId : GenderRace.Unknown;