From eb7e0961f1ca736da82b1838553e184a8e9ff58e Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 16 Feb 2025 23:56:08 +0300 Subject: [PATCH] Update SharedProjectileSystem.cs --- Content.Shared/Projectiles/SharedProjectileSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index be86fd1af2..90189f1c2a 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -88,9 +88,9 @@ public abstract partial class SharedProjectileSystem : EntitySystem EmbedAttach(embeddable, args.Target, args.Shooter, embeddable.Comp); // Raise a specific event for projectiles. - if (TryComp(embeddable, out ProjectileComponent? projectile)) + if (TryComp(embeddable, out ProjectileComponent? projectile) && projectile.Shooter != null && projectile.Weapon != null) //CP14 Null safe checks { - var ev = new ProjectileEmbedEvent(projectile.Shooter!.Value, projectile.Weapon!.Value, args.Target); + var ev = new ProjectileEmbedEvent(projectile.Shooter.Value, projectile.Weapon.Value, args.Target); RaiseLocalEvent(embeddable, ref ev); } }