From d448f2ccaaa3426a8ca5f7a228d16bd4c5adbc3c Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:10:30 +0900
Subject: [PATCH] - fix: Cult robe modifier fix on deconversion. (#144)

---
 Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs b/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
index 66952b32ac..f3bc82616c 100644
--- a/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
+++ b/Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
@@ -7,6 +7,7 @@ using Content.Shared.Inventory;
 using Content.Shared._White.Cult;
 using Content.Shared._White.Cult.Components;
 using JetBrains.Annotations;
+using Robust.Server.Containers;
 using Robust.Shared.Prototypes;
 using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
 using Timer = Robust.Shared.Timing.Timer;
@@ -51,10 +52,9 @@ public sealed partial class DeconvertCultist : ReagentEffect
             return;
 
         cultist.HolyConvertToken = null;
-        entityManager.RemoveComponent<CultistComponent>(uid);
-        entityManager.RemoveComponent<PentagramComponent>(uid);
 
         var inventory = entityManager.System<InventorySystem>();
+        var containerSystem = entityManager.System<ContainerSystem>();
         if (!inventory.TryGetContainerSlotEnumerator(uid, out var enumerator))
             return;
 
@@ -63,8 +63,11 @@ public sealed partial class DeconvertCultist : ReagentEffect
             if (container.ContainedEntity != null &&
                 entityManager.HasComponent<CultItemComponent>(container.ContainedEntity.Value))
             {
-                container.Remove(container.ContainedEntity.Value, entityManager, force: true);
+                containerSystem.Remove(container.ContainedEntity.Value, container, true, true);
             }
         }
+
+        entityManager.RemoveComponent<CultistComponent>(uid);
+        entityManager.RemoveComponent<PentagramComponent>(uid);
     }
 }