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

* Minor fix to rebound ability. Some formatiing.

Browse source
This commit is contained in:
LevelX2 2014-03-11 00:34:52 +01:00
parent d8236a8d3a
commit 63eae70d63
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2013/GroundSeal.java
View file

@ -103,7 +103,7 @@ class GroundSealEffect extends ReplacementEffectImpl<GroundSealEffect> {
StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
if (targetCard != null && stackObject != null) {
Zone zone = game.getState().getZone(targetCard.getId());
if (zone != null && (zone == Zone.GRAVEYARD)) {
if (zone != null && zone.equals(Zone.GRAVEYARD)) {
return true;
}
}

5
Mage.Sets/src/mage/sets/riseoftheeldrazi/DistortionStrike.java
View file

@ -28,6 +28,7 @@
package mage.sets.riseoftheeldrazi;
import java.util.UUID;
import mage.abilities.effects.Effect;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
@ -52,7 +53,9 @@ public class DistortionStrike extends CardImpl<DistortionStrike> {
// Target creature gets +1/+0 until end of turn and is unblockable this turn.
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new UnblockableTargetEffect());
Effect effect = new UnblockableTargetEffect();
effect.setText("and is unblockable this turn");
this.getSpellAbility().addEffect(effect);
// Rebound
this.addAbility(new ReboundAbility());
}

3
Mage/src/mage/abilities/effects/common/combat/UnblockableTargetEffect.java
View file

@ -67,6 +67,9 @@ public class UnblockableTargetEffect extends RestrictionEffect<UnblockableTarget
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
if (mode.getTargets().isEmpty()) {
return "";
}

11
Mage/src/mage/abilities/keyword/ReboundAbility.java
View file

@ -218,12 +218,13 @@ class ReboundCastFromHandReplacementEffect extends ReplacementEffectImpl<Rebound
} else {
Card sourceCard = (Card) game.getObject(source.getSourceId());
Player player = game.getPlayer(sourceCard.getOwnerId());
sourceCard.moveToExile(this.cardId, player.getName() + " Rebound Exile", source.getId(), game);
this.used = true;
return true;
if (player != null) {
player.moveCardToExileWithInfo(sourceCard, this.cardId, new StringBuilder(player.getName()).append(" Rebound").toString(), source.getSourceId(), game, Zone.HAND);
this.used = true;
return true;
}
}
return false;
}
@Override