External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Changes for netMana null handling #5023.

Browse source
This commit is contained in:
LevelX2 2018-06-21 16:27:05 +02:00
parent 1125513c11
commit cd8e038679
5 changed files with 64 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,3 @@
package mage;
import java.io.Serializable;
@ -30,6 +29,14 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
* Default constructor. Creates a {@link Mana} object with 0 values.
*/
public Mana() {
red = 0;
green = 0;
blue = 0;
white = 0;
black = 0;
generic = 0;
colorless = 0;
flag = false;
}
/**
@ -54,6 +61,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
this.generic = notNegative(generic, "Generic");
this.colorless = notNegative(colorless, "Colorless");
this.any = notNegative(any, "Any");
this.flag = false;
}
/**
@ -492,25 +500,25 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
if (generic > 0) {
sbMana.append('{').append(Integer.toString(generic)).append('}');
}
if (colorless >= 20) {
if (colorless >= 20) {
sbMana.append(Integer.toString(colorless)).append("{C}");
}
if (white >= 20) {
if (white >= 20) {
sbMana.append(Integer.toString(white)).append("{W}");
}
if (blue >= 20) {
if (blue >= 20) {
sbMana.append(Integer.toString(blue)).append("{U}");
}
if (black >= 20) {
if (black >= 20) {
sbMana.append(Integer.toString(black)).append("{B}");
}
if (red >= 20) {
if (red >= 20) {
sbMana.append(Integer.toString(red)).append("{R}");
}
if (green >= 20) {
if (green >= 20) {
sbMana.append(Integer.toString(green)).append("{G}");
}
if (any >= 20) {
if (any >= 20) {
sbMana.append(Integer.toString(any)).append("{Any}");
}
for (int i = 0; i < colorless && colorless < 20; i++) {
@ -908,7 +916,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
return true;
} else if (mana.colorless > 0 && this.colorless > 0 && includeColorless) {
return true;
} else if (mana.any > 0 && this.count() > 0){
} else if (mana.any > 0 && this.count() > 0) {
return true;
}

5
Mage/src/main/java/mage/abilities/mana/ActivatedManaAbilityImpl.java
View file

@ -73,7 +73,10 @@ public abstract class ActivatedManaAbilityImpl extends ActivatedAbilityImpl impl
ArrayList<Mana> dynamicNetMana = new ArrayList<>();
for (Effect effect : getEffects()) {
if (effect instanceof ManaEffect) {
dynamicNetMana.addAll(((ManaEffect) effect).getNetMana(game, this));
List<Mana> effectNetMana = ((ManaEffect) effect).getNetMana(game, this);
if (effectNetMana != null) {
dynamicNetMana.addAll(effectNetMana);
}
}
}
return dynamicNetMana;

5
Mage/src/main/java/mage/abilities/mana/ManaOptions.java
View file

@ -1,4 +1,3 @@
package mage.abilities.mana;
import java.util.ArrayList;
@ -12,6 +11,7 @@ import mage.abilities.costs.common.TapSourceCost;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ManaEvent;
import org.apache.log4j.Logger;
/**
*
@ -24,6 +24,8 @@ import mage.game.events.ManaEvent;
*/
public class ManaOptions extends ArrayList<Mana> {
private static final Logger logger = Logger.getLogger(ManaOptions.class);
public ManaOptions() {
}
@ -185,6 +187,7 @@ public class ManaOptions extends ArrayList<Mana> {
Mana moreValuable = Mana.getMoreValuableMana(newMana, existingMana);
if (moreValuable != null) {
existingMana.setToMana(moreValuable);
logger.trace("mana replaced " + newMana.toString() + " <=> " + existingMana.toString() + " from " + ability.getRule());
continue CombineWithExisting;
}
}