Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- fix: Cult robe modifier fix on deconversion. (#144)

Browse Source
This commit is contained in:
Aviu00
2024-02-29 15:10:30 +09:00
committed by GitHub
parent 2b87993642
commit d448f2ccaa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/_White/Cult/HolyWater/DeconvertCultist.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared.Inventory;
using Content.Shared._White.Cult; using Content.Shared._White.Cult;
using Content.Shared._White.Cult.Components; using Content.Shared._White.Cult.Components;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.Containers;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent; using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
using Timer = Robust.Shared.Timing.Timer; using Timer = Robust.Shared.Timing.Timer;
@@ -51,10 +52,9 @@ public sealed partial class DeconvertCultist : ReagentEffect
return; return;
cultist.HolyConvertToken = null; cultist.HolyConvertToken = null;
entityManager.RemoveComponent<CultistComponent>(uid);
entityManager.RemoveComponent<PentagramComponent>(uid);
var inventory = entityManager.System<InventorySystem>(); var inventory = entityManager.System<InventorySystem>();
var containerSystem = entityManager.System<ContainerSystem>();
if (!inventory.TryGetContainerSlotEnumerator(uid, out var enumerator)) if (!inventory.TryGetContainerSlotEnumerator(uid, out var enumerator))
return; return;
@@ -63,8 +63,11 @@ public sealed partial class DeconvertCultist : ReagentEffect
if (container.ContainedEntity != null && if (container.ContainedEntity != null &&
entityManager.HasComponent<CultItemComponent>(container.ContainedEntity.Value)) 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);
} }
} }