From 4f757637ea924392f866108abd29a48cfc7d071e Mon Sep 17 00:00:00 2001 From: Chomp Date: Sun, 23 Feb 2025 14:25:20 +0000 Subject: [PATCH] Cleaned up `GetWeaponCaliber` --- Libraries/Core/Generators/BotWeaponGenerator.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Libraries/Core/Generators/BotWeaponGenerator.cs b/Libraries/Core/Generators/BotWeaponGenerator.cs index f3215272..342b5e36 100644 --- a/Libraries/Core/Generators/BotWeaponGenerator.cs +++ b/Libraries/Core/Generators/BotWeaponGenerator.cs @@ -704,12 +704,12 @@ public class BotWeaponGenerator( /// Caliber as string protected string? GetWeaponCaliber(TemplateItem weaponTemplate) { - if (weaponTemplate.Properties.Caliber is not null) + if (!string.IsNullOrEmpty(weaponTemplate.Properties.Caliber)) { return weaponTemplate.Properties.Caliber; } - if (weaponTemplate.Properties.AmmoCaliber is not null) + if (!string.IsNullOrEmpty(weaponTemplate.Properties.AmmoCaliber)) // 9x18pmm has a typo, should be Caliber9x18PM { return weaponTemplate.Properties.AmmoCaliber == "Caliber9x18PMM" @@ -717,7 +717,7 @@ public class BotWeaponGenerator( : weaponTemplate.Properties.AmmoCaliber; } - if (weaponTemplate.Properties.LinkedWeapon is not null) + if (!string.IsNullOrEmpty(weaponTemplate.Properties.LinkedWeapon)) { var ammoInChamber = _itemHelper.GetItem( weaponTemplate.Properties.Chambers[0].Props.Filters[0].Filter.FirstOrDefault()