Can't break other people's drags on cuffed people (#8868)

* works on my machine

* speedrun
This commit is contained in:
Rane
2022-06-15 21:10:03 -04:00
committed by GitHub
parent d5630e683d
commit e5bad81ac4
3 changed files with 31 additions and 1 deletions

View File

@@ -55,9 +55,11 @@ namespace Content.Shared.Pulling
}
}
var getPulled = new BeingPulledAttemptEvent(puller, pulled);
RaiseLocalEvent(pulled, getPulled);
var startPull = new StartPullAttemptEvent(puller, pulled);
RaiseLocalEvent(puller, startPull);
return !startPull.Cancelled;
return (!startPull.Cancelled && !getPulled.Cancelled);
}
public bool TogglePull(EntityUid puller, SharedPullableComponent pullable)