From 6d2499e52f30ed5919aed94bca9f2652cac513b4 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 9 Apr 2014 00:27:35 +0200 Subject: [PATCH] Finished Godsend. --- .../src/mage/sets/journeyintonyx/Godsend.java | 19 +++++++++++++------ .../dynamicvalue/common/CountersCount.java | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java index 20e24c74bba..f6d550bea6d 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java @@ -41,6 +41,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.continious.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; +import mage.cards.Card; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -50,6 +51,7 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.PermanentIdPredicate; +import mage.game.ExileZone; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.events.GameEvent; @@ -219,12 +221,17 @@ class GodsendReplacementEffect extends ReplacementEffectImpl nameOfExiledCards = new ArrayList<>(); - // game.getExile() -// MageObject object = game.getObject(event.getSourceId()); -// if (object != null && object.getName().equals(game.getState().getValue(source.getSourceId().toString()))) { -// return true; -// } + MageObject object = game.getObject(event.getSourceId()); + if (object != null) { + ExileZone exileZone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source)); + if ((exileZone != null)) { + for(Card card:exileZone.getCards(game)) { + if ((card.getName().equals(object.getName()))) { + return true; + } + } + } + } } return false; } diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java index 4cb70d10f0f..931839cc7b6 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CountersCount.java @@ -9,7 +9,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; public class CountersCount implements DynamicValue { - private CounterType counter; + private final CounterType counter; public CountersCount(CounterType counter) { this.counter = counter;