epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove incorrect comment and merge nested conditionals.

Browse Source
This commit is contained in:
Paul Chote
2021-09-25 17:34:21 +01:00
committed by abcdefg30
parent a0d49729f5
commit 3d73d5ef29
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Conditions/ExternalCondition.cs
View File

@@ -121,10 +121,7 @@ namespace OpenRA.Mods.Common.Traits
if (Info.TotalCap > 0) if (Info.TotalCap > 0)
{ {
var totalCount = permanentTokens.Values.Sum(t => t.Count) + timedTokens.Count; 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; var expire = timedTokens[0].Token;
if (self.TokenValid(expire)) if (self.TokenValid(expire))
@@ -133,7 +130,6 @@ namespace OpenRA.Mods.Common.Traits
timedTokens.RemoveAt(0); timedTokens.RemoveAt(0);
} }
} }
}
var timedToken = new TimedToken(token, self, source, remaining); var timedToken = new TimedToken(token, self, source, remaining);
var index = timedTokens.FindIndex(t => t.Expires >= timedToken.Expires); var index = timedTokens.FindIndex(t => t.Expires >= timedToken.Expires);