From 83ab8528d23dd75f9cf60bea47870222bec6d67a Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Wed, 18 Apr 2018 21:26:57 -0400
Subject: [PATCH] small reversion
---
.../mage/cards/f/FiresongAndSunspeaker.java | 20 +++++++++++++++++++
.../src/mage/cards/s/SoulfireGrandMaster.java | 20 +++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java
index b38ba19bd9..4ccb5bd255 100644
--- a/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java
+++ b/Mage.Sets/src/mage/cards/f/FiresongAndSunspeaker.java
@@ -162,6 +162,26 @@ class GainAbilitySpellsEffect extends ContinuousEffectImpl {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && permanent != null) {
+ for (Card card : game.getExile().getAllCards(game)) {
+ if (card.getOwnerId().equals(source.getControllerId()) && filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
+ for (Card card : player.getLibrary().getCards(game)) {
+ if (filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
+ for (Card card : player.getHand().getCards(game)) {
+ if (filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
+ for (Card card : player.getGraveyard().getCards(game)) {
+ if (filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
for (StackObject stackObject : game.getStack()) {
if (stackObject.getControllerId().equals(source.getControllerId())) {
Card card = game.getCard(stackObject.getSourceId());
diff --git a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java
index 0e2f1fbea9..9a46b1bdf3 100644
--- a/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java
+++ b/Mage.Sets/src/mage/cards/s/SoulfireGrandMaster.java
@@ -130,6 +130,26 @@ class GainAbilitySpellsEffect extends ContinuousEffectImpl {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && permanent != null) {
+ for (Card card : game.getExile().getAllCards(game)) {
+ if (card.getOwnerId().equals(source.getControllerId()) && filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
+ for (Card card : player.getLibrary().getCards(game)) {
+ if (filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
+ for (Card card : player.getHand().getCards(game)) {
+ if (filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
+ for (Card card : player.getGraveyard().getCards(game)) {
+ if (filter.match(card, game)) {
+ game.getState().addOtherAbility(card, ability);
+ }
+ }
for (StackObject stackObject : game.getStack()) {
if (stackObject.getControllerId().equals(source.getControllerId())) {
Card card = game.getCard(stackObject.getSourceId());