From ff2b9de93e97616a9b9500213a58f8f9ada7db02 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 14 Jan 2023 19:58:55 +0100
Subject: [PATCH] Fix deleting active collections.

---
 Penumbra/Collections/CollectionManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Penumbra/Collections/CollectionManager.cs b/Penumbra/Collections/CollectionManager.cs
index 261a91be..2610c455 100644
--- a/Penumbra/Collections/CollectionManager.cs
+++ b/Penumbra/Collections/CollectionManager.cs
@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using Penumbra.GameData.Actors;
 
 namespace Penumbra.Collections;
 
@@ -148,13 +147,22 @@ public partial class ModCollection
                 SetCollection( Empty.Index, CollectionType.Default );
             }
 
+            for( var i = 0; i < _specialCollections.Length; ++i )
+            {
+                if( idx == _specialCollections[ i ]?.Index )
+                {
+                    SetCollection( Empty, ( CollectionType )i );
+                }
+            }
+
             for( var i = 0; i < Individuals.Count; ++i )
             {
                 if( Individuals[ i ].Collection.Index == idx )
                 {
-                    Individuals.ChangeCollection( i, Empty );
+                    SetCollection( Empty, CollectionType.Individual, i );
                 }
             }
+
             var collection = _collections[ idx ];
 
             // Clear own inheritances.