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

@TriggerReplacementBase.meetsCommonRequirements a check for ManaNotSpent was fetching a wrong parameter

Browse Source
This commit is contained in:
Maxmtg
2013-05-18 05:47:37 +00:00
parent ec0f47ee84
commit 591b05d1de
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/card/MagicColor.java
View File

@@ -20,6 +20,7 @@ public class MagicColor {
public static final byte[] WUBRG = new byte[] { WHITE, BLUE, BLACK, RED, GREEN }; public static final byte[] WUBRG = new byte[] { WHITE, BLUE, BLACK, RED, GREEN };
public static byte fromName(String s) { public static byte fromName(String s) {
if( s == null ) return 0;
if (s.equalsIgnoreCase(Constant.Color.WHITE) || s.equalsIgnoreCase("w")) { if (s.equalsIgnoreCase(Constant.Color.WHITE) || s.equalsIgnoreCase("w")) {
return MagicColor.WHITE; return MagicColor.WHITE;
} }

2
src/main/java/forge/card/TriggerReplacementBase.java
View File

@@ -301,7 +301,7 @@ public abstract class TriggerReplacementBase {
} }
if (params.containsKey("ManaNotSpent")) { if (params.containsKey("ManaNotSpent")) {
byte spent = MagicColor.fromName(params.get("ManaSpent")); byte spent = MagicColor.fromName(params.get("ManaNotSpent"));
if ( 0 != (this.getHostCard().getColorsPaid() & spent)) { if ( 0 != (this.getHostCard().getColorsPaid() & spent)) {
return false; return false;
} }