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

Merge branch 'volrath' into 'master'

Browse Source 
Fix Mirage Mirror copying Shifting Sky turning all colorless

See merge request core-developers/forge!6042
This commit is contained in:
Hans Mackowiak
2022-01-13 08:56:58 +00:00
parent 3e4faa7760 387e14ff0b
commit 37e8c41b7e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -457,7 +457,9 @@ public final class StaticAbilityContinuous {
if (params.containsKey("AddColor")) {
final String colors = params.get("AddColor");
if (colors.equals("ChosenColor")) {
addColors = ColorSet.fromNames(hostCard.getChosenColors());
if (hostCard.hasChosenColor()) {
addColors = ColorSet.fromNames(hostCard.getChosenColors());
}
} else if (colors.equals("All")) {
addColors = ColorSet.ALL_COLORS;
} else {
@@ -468,7 +470,9 @@ public final class StaticAbilityContinuous {
if (params.containsKey("SetColor")) {
final String colors = params.get("SetColor");
if (colors.equals("ChosenColor")) {
addColors = ColorSet.fromNames(hostCard.getChosenColors());
if (hostCard.hasChosenColor()) {
addColors = ColorSet.fromNames(hostCard.getChosenColors());
}
} else if (colors.equals("All")) {
addColors = ColorSet.ALL_COLORS;
} else {