* Fixed a bug in table expired check. Changed expired check. Some fixed for table / tournament state handling.

This commit is contained in:
LevelX2 2014-09-03 16:17:43 +02:00
parent 8b331eefce
commit 6f9a6ccabf
2 changed files with 24 additions and 39 deletions

View file

@ -296,10 +296,8 @@ public abstract class AbilityImpl implements Ability {
if (getTargets().size() > 0 && getTargets().chooseTargets(getEffects().get(0).getOutcome(), this.controllerId, this, game) == false) {
if (variableManaCost != null || announceString != null) {
game.informPlayer(controller, new StringBuilder(sourceObject != null ? sourceObject.getLogName(): "").append(": no valid targets with this value of X").toString());
} else {
logger.debug("activate failed - target");
}
return false;
return false; // when activation of ability is canceled during target selection
}
} // end modes
@ -344,8 +342,7 @@ public abstract class AbilityImpl implements Ability {
//20100716 - 601.2f (noMana is not used here, because mana costs were cleared for this ability before adding additional costs and applying cost modification effects)
if (!manaCostsToPay.pay(this, game, sourceId, activatorId, false)) {
logger.debug("activate failed - mana");
return false;
return false; // cancel during mana payment
}
}