From d4f558c3da55f2ed44fe2a3a929b59d2aefa35d7 Mon Sep 17 00:00:00 2001
From: JRHerlehy <justin@herlehy.net>
Date: Sat, 21 Feb 2015 02:41:30 -0800
Subject: [PATCH] More Changes to Tetsuo Umezawa and Bartel Runeaxe

Additional testing to confirm functionality.
---
 .../src/mage/sets/legends/BartelRuneaxe.java    | 10 ++++++----
 .../src/mage/sets/legends/TetsuoUmezawa.java    | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java b/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java
index 9f0039e081..ca69d08412 100644
--- a/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java
+++ b/Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java
@@ -92,6 +92,11 @@ class BartelRuneaxeEffect extends ContinuousRuleModifiyingEffectImpl {
         return new BartelRuneaxeEffect(this);
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.TARGET;
+    }
+
     @Override
     public boolean apply(Game game, Ability source) {
         return true;
@@ -108,15 +113,12 @@ class BartelRuneaxeEffect extends ContinuousRuleModifiyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.TARGET) {
-            Card targetCard = game.getCard(event.getTargetId());
             StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
-            if (targetCard != null && stackObject != null && event.getTargetId().equals(source.getSourceId())) {
+            if (stackObject != null && event.getTargetId().equals(source.getSourceId())) {
                 if (stackObject.getSubtype().contains("Aura")) {
                     return true;
                 }
             }
-        }
         return false;
     }
 }
diff --git a/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java b/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java
index 079b3fd25b..5696be9d0c 100644
--- a/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java
+++ b/Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java
@@ -113,6 +113,11 @@ class TetsuoUmezawaEffect extends ContinuousRuleModifiyingEffectImpl {
         return new TetsuoUmezawaEffect(this);
     }
 
+    @Override
+    public boolean checksEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.TARGET;
+    }
+
     @Override
     public boolean apply(Game game, Ability source) {
         return true;
@@ -129,13 +134,11 @@ class TetsuoUmezawaEffect extends ContinuousRuleModifiyingEffectImpl {
 
     @Override
     public boolean applies(GameEvent event, Ability source, Game game) {
-        if (event.getType() == GameEvent.EventType.TARGET) {
-            Card targetCard = game.getCard(event.getTargetId());
-            StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
-            if (targetCard != null && stackObject != null && event.getTargetId().equals(source.getSourceId())) {
-                if (stackObject.getSubtype().contains("Aura")) {
-                    return true;
-                }
+        //Card targetCard = game.getCard(event.getTargetId());
+        StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
+        if (/*targetCard != null && */stackObject != null && event.getTargetId().equals(source.getSourceId())) {
+            if (stackObject.getSubtype().contains("Aura")) {
+                return true;
             }
         }
         return false;