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

Remove IsFirstTimePredicted from Ninja systems (#41127)

Browse Source 
commit
This commit is contained in:
Kyle Tyo
2025-10-26 17:43:13 -04:00
committed by GitHub
parent c0839f35ad
commit 6046687a29
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Ninja/Systems/DashAbilitySystem.cs
View File

@@ -56,9 +56,6 @@ public sealed class DashAbilitySystem : EntitySystem
/// </summary> /// </summary>
private void OnDash(Entity<DashAbilityComponent> ent, ref DashEvent args) private void OnDash(Entity<DashAbilityComponent> ent, ref DashEvent args)
{ {
if (!_timing.IsFirstTimePredicted)
return;
var (uid, comp) = ent; var (uid, comp) = ent;
var user = args.Performer; var user = args.Performer;
if (!CheckDash(uid, user)) if (!CheckDash(uid, user))

3
Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
View File

@@ -128,8 +128,7 @@ public abstract class SharedNinjaGlovesSystem : EntitySystem
public bool AbilityCheck(EntityUid uid, BeforeInteractHandEvent args, out EntityUid target) public bool AbilityCheck(EntityUid uid, BeforeInteractHandEvent args, out EntityUid target)
{ {
target = args.Target; target = args.Target;
return _timing.IsFirstTimePredicted return !_combatMode.IsInCombatMode(uid)
&& !_combatMode.IsInCombatMode(uid)
&& _hands.GetActiveItem(uid) == null && _hands.GetActiveItem(uid) == null
&& _interaction.InRangeUnobstructed(uid, target); && _interaction.InRangeUnobstructed(uid, target);
} }