From d889a0b04a6efd6e977a1d931dc2b1e650e6fc74 Mon Sep 17 00:00:00 2001 From: EnefFlow Date: Thu, 16 Nov 2023 14:06:05 +0300 Subject: [PATCH] fix netentity --- .../_White/Cult/Runes/Systems/CultSystem.Rune.cs | 8 ++++++-- Content.Shared/_White/Cult/Runes/CultEraseEvent.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs index 93bec744c6..8490aa84f7 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs @@ -274,9 +274,11 @@ public sealed partial class CultSystem : EntitySystem if (HasComp(user)) time /= 2; + var netEntity = GetNetEntity(target); + var ev = new CultEraseEvent { - TargetEntityId = target + TargetEntityId = netEntity }; var argsDoAfterEvent = new DoAfterArgs(_entityManager, user, time, ev, target) @@ -296,7 +298,9 @@ public sealed partial class CultSystem : EntitySystem if (args.Cancelled) return; - _entityManager.DeleteEntity(args.TargetEntityId); + var target = GetEntity(args.TargetEntityId); + + _entityManager.DeleteEntity(target); _popupSystem.PopupEntity(Loc.GetString("cult-erased-rune"), args.User); } diff --git a/Content.Shared/_White/Cult/Runes/CultEraseEvent.cs b/Content.Shared/_White/Cult/Runes/CultEraseEvent.cs index 6e742b6c8c..2b88f46596 100644 --- a/Content.Shared/_White/Cult/Runes/CultEraseEvent.cs +++ b/Content.Shared/_White/Cult/Runes/CultEraseEvent.cs @@ -6,5 +6,5 @@ namespace Content.Shared.White.Cult.Runes; [Serializable, NetSerializable] public sealed partial class CultEraseEvent : SimpleDoAfterEvent { - public EntityUid TargetEntityId; + public NetEntity TargetEntityId; }