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

PlayerImpl.canPlay fix

Browse source
This commit is contained in:
magenoxx 2012-05-25 08:19:04 +04:00
parent 613c4afa8b
commit ed54e78460
2 changed files with 19 additions and 10 deletions
Mage/src/mage
abilities
AbilityImpl.java
players
PlayerImpl.java

11
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -40,6 +40,7 @@ import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.*;
import mage.abilities.mana.ManaAbility;
import mage.cards.Card;
import mage.choices.Choice;
import mage.choices.Choices;
import mage.game.Game;
@ -179,17 +180,15 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
}
}
//20100716 - 601.2e
if (game.getObject(sourceId) != null) {
//game.getObject(sourceId).adjustCosts(this, game);
if (game.getCard(sourceId) != null) {
game.getCard(sourceId).adjustCosts(this, game);
for (Ability ability : game.getCard(sourceId).getAbilities()) {
Card card = game.getCard(sourceId);
if (card != null) {
card.adjustCosts(this, game);
for (Ability ability : card.getAbilities()) {
if (ability instanceof AdjustingSourceCosts) {
((AdjustingSourceCosts)ability).adjustCosts(this, game);
}
}
}
}
// this is a hack to prevent mana abilities with mana costs from causing endless loops - pay other costs first
if (this instanceof ManaAbility && !costs.pay(this, game, sourceId, controllerId, noMana)) {

10
Mage/src/mage/players/PlayerImpl.java
View file

@ -37,6 +37,7 @@ import mage.Mana;
import mage.abilities.*;
import mage.abilities.common.PassAbility;
import mage.abilities.common.delayed.AtTheEndOfTurnStepPostDelayedTriggeredAbility;
import mage.abilities.costs.AdjustingSourceCosts;
import mage.abilities.costs.AlternativeCost;
import mage.abilities.effects.RestrictionEffect;
import mage.abilities.effects.common.LoseControlOnOtherPlayersControllerEffect;
@ -1199,6 +1200,15 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
Ability copy = ability.copy();
game.getContinuousEffects().costModification(copy, game);
Card card = game.getCard(ability.getSourceId());
if (card != null) {
for (Ability ability0 : card.getAbilities()) {
if (ability0 instanceof AdjustingSourceCosts) {
((AdjustingSourceCosts)ability0).adjustCosts(copy, game);
}
}
}
ManaOptions abilityOptions = copy.getManaCostsToPay().getOptions();
if (abilityOptions.size() == 0) {
return true;