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

Merge branch 'fixTypeCount' into 'master'

Browse Source 
Fix MostProminentCreatureType Count

See merge request core-developers/forge!3921
This commit is contained in:
Hans Mackowiak
2021-02-19 17:46:01 +00:00
parent b5fe59b06f f777d5e0aa
commit b43d586a22
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1980,14 +1980,13 @@ public class CardFactoryUtil {
for (final Card c : list) { for (final Card c : list) {
// Remove Duplicated types // Remove Duplicated types
final Set<String> creatureTypes = c.getType().getCreatureTypes(); final Set<String> creatureTypes = c.getType().getCreatureTypes();
if (creatureTypes.contains(CardType.AllCreatureTypes)) {
allCreatureType++;
continue;
}
for (String creatureType : creatureTypes) { for (String creatureType : creatureTypes) {
if (creatureType.equals(CardType.AllCreatureTypes)) { Integer count = map.get(creatureType);
allCreatureType++; map.put(creatureType, count == null ? 1 : count + 1);
}
else {
Integer count = map.get(creatureType);
map.put(creatureType, count == null ? 1 : count + 1);
}
} }
} }