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

* Minor changes to framework.

Browse source
This commit is contained in:
LevelX2 2014-12-02 16:57:05 +01:00
parent d4e2a34ddf
commit 3d6467225a
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/effects/common/DestroyAllEffect.java
View file

@ -48,10 +48,10 @@ public class DestroyAllEffect extends OneShotEffect {
this.filter = filter;
this.noRegen = noRegen;
if (noRegen) {
staticText = "Destroy all " + filter.getMessage() + ". They can't be regenerated";
staticText = "destroy all " + filter.getMessage() + ". They can't be regenerated";
}
else {
staticText = "Destroy all " + filter.getMessage();
staticText = "destroy all " + filter.getMessage();
}
}

2
Mage/src/mage/abilities/effects/common/continious/AddCardTypeTargetEffect.java
View file

@ -79,7 +79,7 @@ public class AddCardTypeTargetEffect extends ContinuousEffectImpl {
@Override
public String getText(Mode mode) {
if (staticText != null) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();

3
Mage/src/mage/target/TargetPlayer.java
View file

@ -94,8 +94,9 @@ public class TargetPlayer extends TargetImpl {
if (player != null && !player.hasLeft() && filter.match(player, sourceId, sourceControllerId, game)) {
if (player.canBeTargetedBy(targetSource, game)) {
count++;
if (count >= this.minNumberOfTargets)
if (count >= this.minNumberOfTargets) {
return true;
}
}
}
}

6
Mage/src/mage/target/common/TargetOpponentsChoicePermanent.java
View file

@ -75,4 +75,10 @@ public class TargetOpponentsChoicePermanent extends TargetPermanent {
}
return opponentId;
}
@Override
public boolean isRequired(Ability ability) {
return true; // opponent can't cancel the spell
}
}