diff --git a/JotunnModStub/ModelBorrow.cs b/JotunnModStub/ModelBorrow.cs
index 1bd8fd2..08a777b 100644
--- a/JotunnModStub/ModelBorrow.cs
+++ b/JotunnModStub/ModelBorrow.cs
@@ -157,7 +157,7 @@ namespace RacesOfValheim
/// True if another component on the same GameObject names this one's type in a
/// [RequireComponent].
- private static bool IsRequired(Component target)
+ public static bool IsRequired(Component target)
{
System.Type type = target.GetType();
foreach (Component other in target.GetComponents())
diff --git a/JotunnModStub/WarVulture/WarVultureItem.cs b/JotunnModStub/WarVulture/WarVultureItem.cs
index 7b735fa..74fc487 100644
--- a/JotunnModStub/WarVulture/WarVultureItem.cs
+++ b/JotunnModStub/WarVulture/WarVultureItem.cs
@@ -229,6 +229,7 @@ namespace RacesOfValheim
if (component is MeshFilter) continue;
if (component is MeshRenderer) continue;
if (component is SkinnedMeshRenderer) continue;
+ if (ModelBorrow.IsRequired(component)) continue; // a later pass, once its dependent is gone
Object.DestroyImmediate(component);
diff --git a/JotunnModStub/WarVulture/WarVultureVisual.cs b/JotunnModStub/WarVulture/WarVultureVisual.cs
index cf42a91..1a944f9 100644
--- a/JotunnModStub/WarVulture/WarVultureVisual.cs
+++ b/JotunnModStub/WarVulture/WarVultureVisual.cs
@@ -118,6 +118,15 @@ namespace RacesOfValheim
if (component == null) continue;
if (IsKept(component)) continue;
+ // Not yet if something still requires it: Unity would refuse and log an error
+ // ("Can't remove Humanoid because CharacterDrop depends on it"). It goes on a
+ // later pass, once its dependent is gone.
+ if (ModelBorrow.IsRequired(component))
+ {
+ stubborn++;
+ continue;
+ }
+
Object.DestroyImmediate(component);
if (component == null) destroyedSomething = true;