From a4f73a9fde745bc3a2a5776adaef777815e5718a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 5 Apr 2014 03:13:27 +0200 Subject: [PATCH] * Golgari Thug - Fixed that card in graveyard was not a mandatory target. --- Mage.Sets/src/mage/sets/ravnika/GolgariThug.java | 2 +- Mage/src/mage/abilities/keyword/DredgeAbility.java | 10 +++------- Mage/src/mage/watchers/common/SoulbondWatcher.java | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java b/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java index 268a0a26619..6ccf853d34a 100644 --- a/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java +++ b/Mage.Sets/src/mage/sets/ravnika/GolgariThug.java @@ -64,7 +64,7 @@ public class GolgariThug extends CardImpl { // When Golgari Thug dies, put target creature card from your graveyard on top of your library. Ability ability = new DiesTriggeredAbility(new PutOnLibraryTargetEffect(true)); - ability.addTarget(new TargetCardInYourGraveyard(filter)); + ability.addTarget(new TargetCardInYourGraveyard(filter, true)); this.addAbility(ability); // Dredge 4 this.addAbility(new DredgeAbility(4)); diff --git a/Mage/src/mage/abilities/keyword/DredgeAbility.java b/Mage/src/mage/abilities/keyword/DredgeAbility.java index 0a5cb821209..4427587698b 100644 --- a/Mage/src/mage/abilities/keyword/DredgeAbility.java +++ b/Mage/src/mage/abilities/keyword/DredgeAbility.java @@ -95,19 +95,15 @@ class DredgeEffect extends ReplacementEffectImpl { Player player = game.getPlayer(source.getControllerId()); if (player != null && player.getLibrary().size() >= amount && player.chooseUse(outcome, new StringBuilder("Dredge ").append(sourceCard.getName()). - append(" (").append(amount).append(" cards go from top of library to graveyard)").toString(), game)) { - + append("? (").append(amount).append(" cards go from top of library to graveyard)").toString(), game)) { + game.informPlayers(new StringBuilder(player.getName()).append(" dreges ").append(sourceCard.getName()).toString()); for (int i = 0; i < amount; i++) { Card card = player.getLibrary().removeFromTop(game); if (card != null) { player.moveCardToGraveyardWithInfo(card, source.getSourceId(), game, Zone.LIBRARY); } } - Card card = game.getCard(source.getSourceId()); - if (card != null) { - game.informPlayers(new StringBuilder(player.getName()).append(" dreges ").append(card.getName()).toString()); - player.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.GRAVEYARD); - } + player.moveCardToHandWithInfo(sourceCard, source.getSourceId(), game, Zone.GRAVEYARD); return true; } return false; diff --git a/Mage/src/mage/watchers/common/SoulbondWatcher.java b/Mage/src/mage/watchers/common/SoulbondWatcher.java index 4bb3097338b..ed03e4ae4f9 100644 --- a/Mage/src/mage/watchers/common/SoulbondWatcher.java +++ b/Mage/src/mage/watchers/common/SoulbondWatcher.java @@ -88,7 +88,7 @@ public class SoulbondWatcher extends WatcherImpl { if (chosen != null) { chosen.setPairedCard(permanent.getId()); permanent.setPairedCard(chosen.getId()); - game.informPlayers(new StringBuilder(controller.getName()).append(" souldbounded ").append(permanent.getName()).append(" with ").append(chosen.getName()).toString()); + game.informPlayers(new StringBuilder(controller.getName()).append(" souldbonds ").append(permanent.getName()).append(" with ").append(chosen.getName()).toString()); } } } @@ -112,7 +112,7 @@ public class SoulbondWatcher extends WatcherImpl { if (controller.chooseUse(Outcome.Benefit, "Use Soulbond for recent " + permanent.getName() + "?", game)) { chosen.setPairedCard(permanent.getId()); permanent.setPairedCard(chosen.getId()); - game.informPlayers(new StringBuilder(controller.getName()).append(" souldbounded ").append(permanent.getName()).append(" with ").append(chosen.getName()).toString()); + game.informPlayers(new StringBuilder(controller.getName()).append(" souldbonds ").append(permanent.getName()).append(" with ").append(chosen.getName()).toString()); break; } }