tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix do_after net initial item (#20363)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-20 22:01:54 +10:00
committed by GitHub
parent 33edef2f9a
commit bbbc1174e6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/DoAfter/SharedDoAfterSystem.cs
View File

@@ -206,9 +206,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
id = new DoAfterId(args.User, comp.NextId++); id = new DoAfterId(args.User, comp.NextId++);
var doAfter = new DoAfter(id.Value.Index, args, GameTiming.CurTime); var doAfter = new DoAfter(id.Value.Index, args, GameTiming.CurTime);
// Networking yay
doAfter.NetInitialItem = GetNetEntity(doAfter.InitialItem);
// Networking yay // Networking yay
args.NetTarget = GetNetEntity(args.Target); args.NetTarget = GetNetEntity(args.Target);
args.NetUsed = GetNetEntity(args.Used); args.NetUsed = GetNetEntity(args.Used);
@@ -238,6 +235,8 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
doAfter.InitialItem = handsComponent.ActiveHandEntity; doAfter.InitialItem = handsComponent.ActiveHandEntity;
} }
doAfter.NetInitialItem = GetNetEntity(doAfter.InitialItem);
// Initial checks // Initial checks
if (ShouldCancel(doAfter, GetEntityQuery<TransformComponent>(), GetEntityQuery<HandsComponent>())) if (ShouldCancel(doAfter, GetEntityQuery<TransformComponent>(), GetEntityQuery<HandsComponent>()))
return false; return false;