external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Same optimisation using iterator on getCardFromSet

Browse Source
This commit is contained in:
leriomaggio
2021-08-25 18:49:03 +01:00
parent 7b70a34da0
commit f507edada5
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -536,17 +536,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
if (candidates.isEmpty()) if (candidates.isEmpty())
return null; return null;
PaperCard candidate = candidates.get(0); Iterator<PaperCard> candidatesIterator = candidates.iterator();
PaperCard candidate = candidatesIterator.next();
// Before returning make sure that actual candidate has Image. // Before returning make sure that actual candidate has Image.
// If not, try to replace current candidate with one having image, // If not, try to replace current candidate with one having image,
// so to align this implementation with old one. // so to align this implementation with old one.
if (!candidate.hasImage()) { while (!candidate.hasImage() && candidatesIterator.hasNext()) {
for (PaperCard card : candidates) { candidate = candidatesIterator.next();
if (card.hasImage()) {
candidate = card;
break; // found, ready to go
}
}
} }
return isFoil ? candidate.getFoiled() : candidate; return isFoil ? candidate.getFoiled() : candidate;
} }