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

[DTK] Fixed handling of Dragon Watcher.

Browse source
This commit is contained in:
LevelX2 2015-03-18 21:58:34 +01:00
parent cb8d19906a
commit c6695415da
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/sets/gameday/ScaleguardSentinels.java
View file

@ -32,11 +32,11 @@ import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.RevealTargetFromHandCost;
import mage.abilities.effects.common.InfoEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.cards.CardImpl;
import mage.constants.AbilityType;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.counters.CounterType;
@ -80,7 +80,7 @@ public class ScaleguardSentinels extends CardImpl {
@Override
public void adjustCosts(Ability ability, Game game) {
if (ability instanceof EntersBattlefieldAbility) {
if (ability.getAbilityType().equals(AbilityType.SPELL)) {
Player controller = game.getPlayer(ability.getControllerId());
if (controller != null) {
if (controller.getHand().count(filter, game) > 0) {
@ -111,14 +111,6 @@ class ScaleguardSentinelsCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
DragonOnTheBattlefieldWhileSpellWasCastWatcher watcher = (DragonOnTheBattlefieldWhileSpellWasCastWatcher) game.getState().getWatchers().get("DragonOnTheBattlefieldWhileSpellWasCastWatcher");
boolean condition = watcher != null && watcher.castWithConditionTrue(source.getId());
if (!condition) {
for (Cost cost: source.getCosts()) {
if (cost instanceof RevealTargetFromHandCost) {
condition = ((RevealTargetFromHandCost)cost).getNumberRevealedCards() > 0;
}
}
}
return condition;
return (watcher != null && watcher.castWithConditionTrue(source.getId()));
}
}