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

Fixed variable cost not working in ActivateOncePerTurnActivatedAbility.

Browse source
This commit is contained in:
magenoxx 2011-07-31 19:13:55 +04:00
parent 1ccaf403a6
commit 1181988fd4
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/ActivatedAbilityImpl.java
View file

@ -35,7 +35,9 @@ import mage.Constants.Zone;
import mage.abilities.costs.Cost;
import mage.abilities.costs.Costs;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.costs.mana.PhyrexianManaCost;
import mage.abilities.costs.mana.VariableManaCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.Effects;
import mage.cards.Card;
@ -98,6 +100,8 @@ public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> ex
if (cost != null) {
if (cost instanceof PhyrexianManaCost) {
this.addManaCost((PhyrexianManaCost)cost);
} else if (cost instanceof ManaCostsImpl) {
this.addManaCost((ManaCostsImpl) cost);
} else {
this.addCost(cost);
}

15
Mage/src/mage/abilities/common/ActivateOncePerTurnActivatedAbility.java
View file

@ -32,6 +32,8 @@ import java.util.UUID;
import mage.Constants.Zone;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.effects.Effect;
import mage.game.Game;
@ -51,11 +53,14 @@ public class ActivateOncePerTurnActivatedAbility extends ActivatedAbilityImpl<Ac
@Override
public boolean canActivate(UUID playerId, Game game) {
Boolean activated = (Boolean)game.getState().getValue(this.originalId.toString() + "activated");
if (activated == null)
return true;
else
return !activated;
if (super.canActivate(playerId, game)) {
Boolean activated = (Boolean)game.getState().getValue(this.originalId.toString() + "activated");
if (activated == null)
return true;
else
return !activated;
}
return false;
}
@Override