From d6c1ad821078423d58e46b6bf9ad81d4c01b61e4 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Tue, 16 Mar 2021 20:23:40 +0100 Subject: [PATCH] Fix not null asserts in guns --- .../Components/Weapon/Ranged/Ammunition/AmmoComponent.cs | 1 - .../Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs | 2 -- .../Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs | 2 -- 3 files changed, 5 deletions(-) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs index 7251396486..223c39a383 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -121,7 +121,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition var entity = Owner.EntityManager.SpawnEntity(_projectileId, spawnAt); - DebugTools.AssertNotNull(entity); return entity; } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs index 91091abe5d..2d5f50772e 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -131,8 +131,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels // (Is one chambered?, is the bullet spend) var chamber = (chamberedExists, false); - DebugTools.AssertNotNull(_chamberContainer.ContainedEntity); - if (chamberedExists && _chamberContainer.ContainedEntity!.TryGetComponent(out var ammo)) { chamber.Item2 = ammo.Spent; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs index a0805be692..163fce067a 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs @@ -84,8 +84,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels // (Is one chambered?, is the bullet spend) var chamber = (chamberedExists, false); - DebugTools.AssertNotNull(_chamberContainer.ContainedEntity); - if (chamberedExists && _chamberContainer.ContainedEntity!.TryGetComponent(out var ammo)) { chamber.Item2 = ammo.Spent;