From 02b8487d6c4f177833bdf5601ee4f02d9d7e2b3b Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 25 Jun 2020 01:31:04 +1000 Subject: [PATCH] Fix EntityTest for guns (#1206) Co-authored-by: Metal Gear Sloth --- .../Ranged/Barrels/ServerRangedBarrelComponent.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index 2690bd277e..849b1fda75 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -140,10 +140,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels public override void OnRemove() { base.OnRemove(); - var rangedWeapon = Owner.GetComponent(); - rangedWeapon.Barrel = null; - rangedWeapon.FireHandler -= Fire; - rangedWeapon.WeaponCanFireHandler -= WeaponCanFire; + if (Owner.TryGetComponent(out ServerRangedWeaponComponent rangedWeaponComponent)) + { + rangedWeaponComponent.Barrel = null; + rangedWeaponComponent.FireHandler -= Fire; + rangedWeaponComponent.WeaponCanFireHandler -= WeaponCanFire; + } } private Angle GetRecoilAngle(Angle direction)