From bbbc1174e608eaa0312f86b56f27f27cb9678dec Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 20 Sep 2023 22:01:54 +1000 Subject: [PATCH] Fix do_after net initial item (#20363) --- Content.Shared/DoAfter/SharedDoAfterSystem.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs index 815310f7f1..691d9a4758 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs @@ -206,9 +206,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem id = new DoAfterId(args.User, comp.NextId++); var doAfter = new DoAfter(id.Value.Index, args, GameTiming.CurTime); - // Networking yay - doAfter.NetInitialItem = GetNetEntity(doAfter.InitialItem); - // Networking yay args.NetTarget = GetNetEntity(args.Target); args.NetUsed = GetNetEntity(args.Used); @@ -238,6 +235,8 @@ public abstract partial class SharedDoAfterSystem : EntitySystem doAfter.InitialItem = handsComponent.ActiveHandEntity; } + doAfter.NetInitialItem = GetNetEntity(doAfter.InitialItem); + // Initial checks if (ShouldCancel(doAfter, GetEntityQuery(), GetEntityQuery())) return false; -- 2.51.2