github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 11:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/magefree/mage.git

Browse source
This commit is contained in:
jeffwadsworth 2012-12-14 17:10:02 -06:00
commit 279934d8ee
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
View file

@ -56,7 +56,7 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl<Conditiona
@Override
public String getRule() {
if (text != null && text.isEmpty()) {
if (text == null || text.isEmpty()) {
return ability.getRule();
}
return text;

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

@ -40,7 +40,7 @@ import mage.players.Player;
/**
*
* @author LevelX
* @author LevelX2
*/
public class SkipNextPlayerUntapStepEffect extends OneShotEffect<SkipNextPlayerUntapStepEffect> {
@ -82,7 +82,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect<SkipNextPlayerU
} else {
sb.append("target");
}
sb.append("player skips his or her next untap step");
sb.append(" player skips his or her next untap step");
return sb.toString();
}
}