From b535909a4983919b4764c72f7409d881cea02ae8 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 19 Jan 2024 21:14:41 +1100 Subject: [PATCH] Fix gun bolt crash (#24283) Deleting non-predicted entities moment. --- .../Ranged/Systems/SharedGunSystem.ChamberMagazine.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index 1b124cd51d..dc5dc5b90c 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -232,7 +232,10 @@ public abstract partial class SharedGunSystem { foreach (var (ent, _) in relayedArgs.Ammo) { - Del(ent!.Value); + if (!IsClientSide(ent!.Value)) + continue; + + Del(ent.Value); } } }