Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix misc cuffing issues (#12127)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-22 18:54:28 +13:00
committed by GitHub
parent b75cd3f7ca
commit b73d188e67
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Cuffs/Components/CuffableComponent.cs
View File

@@ -235,7 +235,7 @@ namespace Content.Server.Cuffs.Components
}
var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime;
var doAfterEventArgs = new DoAfterEventArgs(user, uncuffTime)
var doAfterEventArgs = new DoAfterEventArgs(user, uncuffTime, target: Owner)
{
BreakOnUserMove = true,
BreakOnTargetMove = true,

4
Content.Server/DoAfter/DoAfterEventArgs.cs
View File

@@ -1,5 +1,6 @@
using System.Threading;
using System.Threading;
using Content.Shared.FixedPoint;
using Robust.Shared.Utility;
namespace Content.Server.DoAfter
{
@@ -125,6 +126,7 @@ namespace Content.Server.DoAfter
if (Target == null)
{
DebugTools.Assert(!BreakOnTargetMove);
BreakOnTargetMove = false;
}
}