From d755e86fdabe5b6b0b84579852c95a6c9dc73af5 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 24 Jul 2017 10:41:21 +0200
Subject: [PATCH] * Some minor chnages.

---
 .../src/mage/cards/m/MangaraOfCorondor.java   |  4 +-
 Mage.Sets/src/mage/cards/s/SoulSnare.java     | 37 +++----------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java b/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java
index 88ea8e319c..0cd2ede443 100644
--- a/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java
+++ b/Mage.Sets/src/mage/cards/m/MangaraOfCorondor.java
@@ -48,7 +48,7 @@ import mage.target.TargetPermanent;
 public class MangaraOfCorondor extends CardImpl {
 
     public MangaraOfCorondor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
         addSuperType(SuperType.LEGENDARY);
         this.subtype.add("Human");
         this.subtype.add("Wizard");
@@ -56,7 +56,7 @@ public class MangaraOfCorondor extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {tap}: Exile Mangara of Corondor and target permanent.
+        // {T}: Exile Mangara of Corondor and target permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileSourceEffect(), new TapSourceCost());
         ability.addEffect(new ExileTargetEffect());
         ability.addTarget(new TargetPermanent());
diff --git a/Mage.Sets/src/mage/cards/s/SoulSnare.java b/Mage.Sets/src/mage/cards/s/SoulSnare.java
index fdd662434f..e68f31e8fa 100644
--- a/Mage.Sets/src/mage/cards/s/SoulSnare.java
+++ b/Mage.Sets/src/mage/cards/s/SoulSnare.java
@@ -32,7 +32,6 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.ExileTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -40,24 +39,22 @@ import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.filter.common.FilterAttackingCreature;
 import mage.game.Game;
-import mage.game.combat.CombatGroup;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
  *
  * @author LoneFox
-
+ *
  */
 public class SoulSnare extends CardImpl {
 
     public SoulSnare(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}");
 
         // {W}, Sacrifice Soul Snare: Exile target creature that's attacking you or a planeswalker you control.
-        Effect effect = new ExileTargetEffect();
-        effect.setText("Exile target creature that's attacking you or a planeswalker you control.");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new ExileTargetEffect(), new ManaCostsImpl("{W}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCreaturePermanent(new SoulSnareFilter()));
         this.addAbility(ability);
@@ -79,7 +76,6 @@ class SoulSnareFilter extends FilterAttackingCreature {
         super("creature that's attacking you or a planeswalker you control");
     }
 
-
     public SoulSnareFilter(final SoulSnareFilter filter) {
         super(filter);
     }
@@ -91,28 +87,7 @@ class SoulSnareFilter extends FilterAttackingCreature {
 
     @Override
     public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
-        if(!super.match(permanent, sourceId, playerId, game)) {
-            return false;
-        }
-
-        for(CombatGroup group : game.getCombat().getGroups()) {
-            for(UUID attacker : group.getAttackers()) {
-                if(attacker.equals(permanent.getId())) {
-                    UUID defenderId = group.getDefenderId();
-                    if(defenderId.equals(playerId)) {
-                        return true;
-                    }
-                    else {
-                        Permanent planeswalker = game.getPermanent(defenderId);
-                        if(planeswalker != null && planeswalker.isPlaneswalker()
-                            && planeswalker.getControllerId().equals(playerId)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        return false;
+        return super.match(permanent, sourceId, playerId, game)
+                && playerId.equals(game.getCombat().getDefendingPlayerId(permanent.getId(), game));
     }
 }