From 3d73d5ef296bdb1fdae7bbf0bfc6234550a8e05a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 25 Sep 2021 17:34:21 +0100 Subject: [PATCH] Remove incorrect comment and merge nested conditionals. --- .../Traits/Conditions/ExternalCondition.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Conditions/ExternalCondition.cs b/OpenRA.Mods.Common/Traits/Conditions/ExternalCondition.cs index 8c1c399b26..d128483a0c 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/ExternalCondition.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/ExternalCondition.cs @@ -121,17 +121,13 @@ namespace OpenRA.Mods.Common.Traits if (Info.TotalCap > 0) { var totalCount = permanentTokens.Values.Sum(t => t.Count) + timedTokens.Count; - if (totalCount >= Info.TotalCap) + if (totalCount >= Info.TotalCap && timedTokens.Count > 0) { - // Prefer tokens from the same source - if (timedTokens.Count > 0) - { - var expire = timedTokens[0].Token; - if (self.TokenValid(expire)) - self.RevokeCondition(expire); + var expire = timedTokens[0].Token; + if (self.TokenValid(expire)) + self.RevokeCondition(expire); - timedTokens.RemoveAt(0); - } + timedTokens.RemoveAt(0); } }