diff --git a/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs b/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs index e91548571d..c424af6c00 100644 --- a/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs +++ b/Source/CombatExtended/CombatExtended/Building_AmmoContainerCE/Building_AutoloaderCE.cs @@ -349,9 +349,11 @@ public bool StartReload(CompAmmoUser TurretMagazine, bool continued = false) //if this is the right turret to reload if (graphicsExt != null) { - bool tagMatch = false; + //if def exists and match + bool tagMatch = graphicsExt.allowedTurrets.Any() && graphicsExt.allowedTurrets.Contains(turret.def.defName); + //if tag exists and match - if (graphicsExt.allowedTurretTags.Any()) + if (!tagMatch && graphicsExt.allowedTurretTags.Any()) { foreach (string loadertag in graphicsExt.allowedTurretTags) { @@ -363,12 +365,6 @@ public bool StartReload(CompAmmoUser TurretMagazine, bool continued = false) } } - //if def exists and match - if (graphicsExt.allowedTurrets.Any() && graphicsExt.allowedTurrets.Contains(turret.def.defName)) - { - tagMatch = true; - } - if (!tagMatch) { return false;