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

ColorSet: add combine function (#8960)

Browse Source
This commit is contained in:
Hans Mackowiak
2025-10-20 09:45:57 +02:00
committed by GitHub
parent a8d494d2d8
commit 5efd7e6e7c
16 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/CardRules.java
View File

@@ -235,7 +235,7 @@ public final class CardRules implements ICardCharacteristics {
public ColorSet getColor() {
switch (splitType.getAggregationMethod()) {
case COMBINE:
return ColorSet.fromMask(mainPart.getColor().getColor() | otherPart.getColor().getColor());
return ColorSet.combine(mainPart.getColor(), otherPart.getColor());
default:
return mainPart.getColor();
}

8
forge-core/src/main/java/forge/card/ColorSet.java
View File

@@ -123,6 +123,14 @@ public enum ColorSet implements Iterable<Color>, Serializable {
return fromMask(mana.getColorProfile());
}
public static ColorSet combine(final ColorSet... colors) {
byte mask = 0;
for (ColorSet c : colors) {
mask |= c.getColor();
}
return fromMask(mask);
}
/**
* Checks for any color.
*