External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a test. Some minor changes.

Browse source
This commit is contained in:
LevelX2 2016-01-29 15:24:48 +01:00
parent 0c229321a6
commit 768d7f1ceb
4 changed files with 94 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/abilities/condition/CompoundCondition.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.condition;
import java.util.ArrayList;
@ -34,14 +33,15 @@ import mage.abilities.Ability;
import mage.game.Game;
/**
* Combines conditions to one compound conditon, all single conditons
* must be true to return true for the compound condtion.
* Combines conditions to one compound conditon, all single conditons must be
* true to return true for the compound condtion.
*
* @author LevelX2
*/
public class CompoundCondition implements Condition {
private final ArrayList<Condition> conditions = new ArrayList();
private final ArrayList<Condition> conditions = new ArrayList<>();
private final String text;
public CompoundCondition(Condition... conditions) {
@ -55,7 +55,7 @@ public class CompoundCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
for (Condition condition: conditions) {
for (Condition condition : conditions) {
if (!condition.apply(game, source)) {
return false;
}

2
Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java
View file

@ -70,7 +70,7 @@ public class BoostControlledEffect extends ContinuousEffectImpl {
}
public BoostControlledEffect(int power, int toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource) {
this(new StaticValue(power), new StaticValue(toughness), duration, filter, excludeSource);
this(new StaticValue(power), new StaticValue(toughness), duration, filter, excludeSource, true);
}
public BoostControlledEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource) {