github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 01:01:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2013-11-21 09:59:34 +01:00
commit 176c2a76b4
2 changed files with 5 additions and 4 deletions
Mage/src/mage
abilities/effects/common/continious
CommanderReplacementEffect.java
game/stack
Spell.java

3
Mage/src/mage/abilities/effects/common/continious/CommanderReplacementEffect.java
View file

@ -52,7 +52,7 @@ import mage.players.Player;
*/ */
public class CommanderReplacementEffect extends ReplacementEffectImpl<CommanderReplacementEffect> { public class CommanderReplacementEffect extends ReplacementEffectImpl<CommanderReplacementEffect> {
private UUID commanderId; private final UUID commanderId;
public CommanderReplacementEffect(UUID commanderId) { public CommanderReplacementEffect(UUID commanderId) {
super(Duration.WhileOnBattlefield, Outcome.Benefit); super(Duration.WhileOnBattlefield, Outcome.Benefit);
@ -63,6 +63,7 @@ public class CommanderReplacementEffect extends ReplacementEffectImpl<CommanderR
public CommanderReplacementEffect(final CommanderReplacementEffect effect) { public CommanderReplacementEffect(final CommanderReplacementEffect effect) {
super(effect); super(effect);
this.commanderId = effect.commanderId;
} }
@Override @Override

6
Mage/src/mage/game/stack/Spell.java
View file

@ -184,14 +184,14 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
} else if (this.getCardType().contains(CardType.ENCHANTMENT) && this.getSubtype().contains("Aura")) { } else if (this.getCardType().contains(CardType.ENCHANTMENT) && this.getSubtype().contains("Aura")) {
if (ability.getTargets().stillLegal(ability, game)) { if (ability.getTargets().stillLegal(ability, game)) {
updateOptionalCosts(0); updateOptionalCosts(0);
if (card.putOntoBattlefield(game, Zone.HAND, ability.getId(), controllerId)) { if (card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId)) {
return ability.resolve(game); return ability.resolve(game);
} }
return false; return false;
} }
if (this.getCardType().contains(CardType.CREATURE)) { // e.g. Creature with Bestow (rule confirmation yet missing) if (this.getCardType().contains(CardType.CREATURE)) { // e.g. Creature with Bestow (rule confirmation yet missing)
updateOptionalCosts(0); updateOptionalCosts(0);
result = card.putOntoBattlefield(game, Zone.HAND, ability.getId(), controllerId); result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);
return result; return result;
} else { } else {
//20091005 - 608.2b //20091005 - 608.2b
@ -201,7 +201,7 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
} }
} else { } else {
updateOptionalCosts(0); updateOptionalCosts(0);
result = card.putOntoBattlefield(game, Zone.HAND, ability.getId(), controllerId); result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);
return result; return result;
} }
} }