github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

spjspj - containsAny is meant to be for coloured mana

Browse source
This commit is contained in:
spjspj 2016-04-19 12:52:20 +10:00
parent c885f212d3
commit 473cdd0c17
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/Mana.java
View file

@ -816,11 +816,11 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
} }
/** /**
* Returns if this objects mana contains any mana the same as the passed in * Returns if this objects mana contains any coloured mana the same as the passed in
* {@link Mana}'s mana. * {@link Mana}'s mana.
* *
* @param mana the mana to check for * @param mana the mana to check for
* @return true if this contains any of the same type of mana that this has * @return true if this contains any of the same type of coloured mana that this has
*/ */
public boolean containsAny(final Mana mana) { public boolean containsAny(final Mana mana) {
if (mana.black > 0 && this.black > 0) { if (mana.black > 0 && this.black > 0) {
@ -833,9 +833,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
return true; return true;
} else if (mana.green > 0 && this.green > 0) { } else if (mana.green > 0 && this.green > 0) {
return true; return true;
} else if (mana.colorless > 0 && this.colorless > 0) { }
return true;
}
return false; return false;
} }