From 2bc077677cf6dea26fde2f5a90d154e23a4a5720 Mon Sep 17 00:00:00 2001
From: spjspj <spjspj4@gmail.com>
Date: Fri, 14 Jul 2017 17:03:54 +1000
Subject: [PATCH] Fix for Soul Barrier

---
 Mage.Sets/src/mage/cards/s/SoulBarrier.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/s/SoulBarrier.java b/Mage.Sets/src/mage/cards/s/SoulBarrier.java
index b93b14dafe9..d8d1f602a0c 100644
--- a/Mage.Sets/src/mage/cards/s/SoulBarrier.java
+++ b/Mage.Sets/src/mage/cards/s/SoulBarrier.java
@@ -27,6 +27,8 @@
  */
 package mage.cards.s;
 
+import java.util.UUID;
+
 import mage.abilities.Ability;
 import mage.abilities.common.SpellCastOpponentTriggeredAbility;
 import mage.abilities.costs.mana.GenericManaCost;
@@ -39,10 +41,9 @@ import mage.constants.SetTargetPointer;
 import mage.constants.Zone;
 import mage.filter.StaticFilters;
 import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.players.Player;
 
-import java.util.UUID;
-
 /**
  *
  * @author Galatolol
@@ -51,10 +52,10 @@ public class SoulBarrier extends CardImpl {
 
     public SoulBarrier(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}");
-        
+
         // Whenever an opponent casts a creature spell, Soul Barrier deals 2 damage to that player unless he or she pays {2}.
         this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new SoulBarrierEffect(),
-                StaticFilters.FILTER_SPELL,false, SetTargetPointer.PLAYER));
+                StaticFilters.FILTER_SPELL_A_CREATURE, false, SetTargetPointer.PLAYER));
     }
 
     public SoulBarrier(final SoulBarrier card) {
@@ -86,9 +87,13 @@ class SoulBarrierEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source));
-        if (player != null) {
+        Permanent permanent = game.getPermanent(source.getSourceId());
+
+        if (player != null && permanent != null) {
             GenericManaCost cost = new GenericManaCost(2);
-            if (!cost.pay(source, game, player.getId(), player.getId(), false)) {
+            String message = "Would you like to pay {2} to prevent taking 2 damage from " + permanent.getLogName() + "?";
+            if (!(player.chooseUse(Outcome.Benefit, message, source, game)
+                    && cost.pay(source, game, source.getSourceId(), player.getId(), false, null))) {
                 player.damage(2, source.getSourceId(), game, false, true);
             }
             return true;