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

Make projectiles not hit crates unless clicked on (#28072)

Browse Source
This commit is contained in:
Cojoke
2024-06-03 08:04:07 -05:00
committed by GitHub
parent 977bd5ad6d
commit e784f2cf3c
5 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
View File

@@ -46,7 +46,6 @@ public partial class MobStateSystem
SubscribeLocalEvent<MobStateComponent, TryingToSleepEvent>(OnSleepAttempt);
SubscribeLocalEvent<MobStateComponent, CombatModeShouldHandInteractEvent>(OnCombatModeShouldHandInteract);
SubscribeLocalEvent<MobStateComponent, AttemptPacifiedAttackEvent>(OnAttemptPacifiedAttack);
SubscribeLocalEvent<MobStateComponent, PreventCollideEvent>(OnPreventCollide);
}
private void OnStateExitSubscribers(EntityUid target, MobStateComponent component, MobState state)
@@ -179,21 +178,5 @@ public partial class MobStateSystem
args.Cancelled = true;
}
private void OnPreventCollide(Entity<MobStateComponent> ent, ref PreventCollideEvent args)
{
if (args.Cancelled)
return;
if (IsAlive(ent, ent))
return;
var other = args.OtherEntity;
if (HasComp<ProjectileComponent>(other) &&
CompOrNull<TargetedProjectileComponent>(other)?.Target != ent.Owner)
{
args.Cancelled = true;
}
}
#endregion
}