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

Prevent projectiles from colliding with their guns (#20439)

Browse Source
This commit is contained in:
Leon Friedrich
2023-09-23 16:08:35 -04:00
committed by GitHub
parent 6feb66ad42
commit a3b44013fc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Projectiles/SharedProjectileSystem.cs
View File

@@ -128,7 +128,7 @@ public abstract partial class SharedProjectileSystem : EntitySystem
private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args) private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args)
{ {
if (component.IgnoreShooter && args.OtherEntity == component.Shooter) if (component.IgnoreShooter && (args.OtherEntity == component.Shooter || args.OtherEntity == component.Weapon))
{ {
args.Cancelled = true; args.Cancelled = true;
} }