Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Support for null rule texts in effects

Browse source
This commit is contained in:
magenoxx 2012-05-15 07:20:18 +04:00
parent 67470fd9f4
commit a40a1bb3f5
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/mage/abilities/effects/EffectImpl.java
View file

@ -28,15 +28,16 @@
package mage.abilities.effects;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import mage.Constants.EffectType;
import mage.Constants.Outcome;
import mage.abilities.Mode;
import mage.target.targetpointer.FirstTargetPointer;
import mage.target.targetpointer.TargetPointer;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -77,22 +78,9 @@ public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
@Override
public String getText(Mode mode) {
return staticText;
// if (staticText.equals("")) {
// return getDynamicText(source);
// } else {
// return staticText;
// }
return staticText;
}
// protected String getDynamicText(Ability source) {
// return "";
// }
// public void setStaticText(String staticText) {
// this.staticText = staticText;
// }
@Override
public Outcome getOutcome() {
return outcome;

10
Mage/src/mage/abilities/effects/Effects.java
View file

@ -28,12 +28,13 @@
package mage.abilities.effects;
import mage.Constants.Outcome;
import mage.abilities.Mode;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mage.Constants.Outcome;
import mage.abilities.Mode;
/**
*
@ -56,7 +57,10 @@ public class Effects extends ArrayList<Effect> {
public String getText(Mode mode) {
StringBuilder sbText = new StringBuilder();
for (Effect effect: this) {
sbText.append(effect.getText(mode)).append(". ");
String rule = effect.getText(mode);
if (rule != null) {
sbText.append(effect.getText(mode)).append(". ");
}
}
return sbText.toString();
}