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

Jezithyr · Sep 23, 2023 · a3b4401 · a3b4401
1 parent 6feb66a
commit a3b4401
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -128,7 +128,7 @@ private void Embed(EntityUid uid, EntityUid target, EmbeddableProjectileComponen
 
     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;
         }