From beec4915c4f83d4c069d259c3fdfcbd2cf5c30d5 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Wed, 28 Jul 2021 16:51:32 +0100 Subject: [PATCH] Just cleanup and formattings for getMaxArtIndex and getArtCount --- forge-core/src/main/java/forge/card/CardDb.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java index d122c280d26..0c595b058fe 100644 --- a/forge-core/src/main/java/forge/card/CardDb.java +++ b/forge-core/src/main/java/forge/card/CardDb.java @@ -697,9 +697,8 @@ public final class CardDb implements ICardDatabase, IDeckGenPool { return IPaperCard.NO_ART_INDEX; int max = IPaperCard.NO_ART_INDEX; for (PaperCard pc : getAllCards(cardName)) { - if (max < pc.getArtIndex()) { + if (max < pc.getArtIndex()) max = pc.getArtIndex(); - } } return max; } @@ -709,18 +708,13 @@ public final class CardDb implements ICardDatabase, IDeckGenPool { int cnt = 0; if (cardName == null || setName == null) return cnt; - Collection cards = getAllCards(cardName); - if (null == cards) { + if (null == cards || cards.size() == 0) return 0; - } - for (PaperCard pc : cards) { - if (pc.getEdition().equalsIgnoreCase(setName)) { + if (pc.getEdition().equalsIgnoreCase(setName)) cnt++; - } } - return cnt; }