From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 20 Sep 2023 12:01:54 +0000 (+1000)
Subject: Fix do_after net initial item (#20363)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bbbc1174e608eaa0312f86b56f27f27cb9678dec;p=space-station-14.git

Fix do_after net initial item (#20363)
---

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<TransformComponent>(), GetEntityQuery<HandsComponent>()))
             return false;