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

Merge pull request #2959 from ingmargoudt/master

Browse source 
reformat manapool isempty
This commit is contained in:
ingmargoudt 2017-03-11 15:12:50 +01:00 committed by GitHub
commit b640f6b289
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
View file

@ -231,7 +231,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof ColorlessManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -240,7 +240,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof ColoredManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -249,7 +249,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof HybridManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -265,7 +265,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
|| ((cost.containsColor(ColoredManaSymbol.G)) && pool.getGreen() > 0)
|| ((cost.containsColor(ColoredManaSymbol.U)) && pool.getBlue() > 0)) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -275,7 +275,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof MonoHybridManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -284,7 +284,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof SnowManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -293,7 +293,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
for (ManaCost cost : this) {
if (!cost.isPaid() && cost instanceof GenericManaCost) {
cost.assignPayment(game, ability, pool, costToPay);
if (pool.count() == 0) {
if (pool.isEmpty()) {
return;
}
}
@ -357,6 +357,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
}
private boolean isNumeric(String symbol) {
try {
Integer.parseInt(symbol);
return true;