From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 23 Sep 2023 20:08:35 +0000 (-0400)
Subject: Prevent projectiles from colliding with their guns (#20439)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a3b44013fc331f3cabbb4c55009bf737a0a2c3af;p=space-station-14.git

Prevent projectiles from colliding with their guns (#20439)
---

diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 92465be2e5..6c5d7897c2 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -128,7 +128,7 @@ public abstract partial class SharedProjectileSystem : EntitySystem
 
     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;
         }