]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Prevent projectiles from colliding with their guns (#20439)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Sat, 23 Sep 2023 20:08:35 +0000 (16:08 -0400)
committerGitHub <noreply@github.com>
Sat, 23 Sep 2023 20:08:35 +0000 (12:08 -0800)
Content.Shared/Projectiles/SharedProjectileSystem.cs

index 92465be2e58c129ab703610fa111720f63c81dc5..6c5d7897c234c94947e5fb772fd76ee7d6441391 100644 (file)
@@ -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;
         }