NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix for stripping doafters (#30821)

Browse source 
Apparently I need to check if they're holding an item

Co-authored-by: plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya 2024-08-09 05:02:06 -07:00 • committed by GitHub
parent c3e96b3770
commit 9f8ff021ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
View file

@ -229,7 +229,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
// If an item was in the user's hand to begin with,
// check if the user is no longer holding the item.
if (args.BreakOnDropItem && !_hands.IsHolding((args.User, hands), doAfter.InitialItem))
if (args.BreakOnDropItem && doAfter.InitialItem != null && !_hands.IsHolding((args.User, hands), doAfter.InitialItem))
return true;
// If the user changes which hand is active at all, interrupt the do-after