From fb56e315fa2748c239c931fa41ecb58096f9ea45 Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Sun, 14 Aug 2011 19:03:57 +0300
Subject: [PATCH] Fixed Livewire Lash (NPE).

---
 Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java | 6 +++---
 Mage/src/mage/filter/FilterObject.java                    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java
index 0a8d32083f5..f56f4cb7868 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java
@@ -44,6 +44,7 @@ import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
+import mage.game.stack.Spell;
 import mage.target.common.TargetCreatureOrPlayer;
 
 /**
@@ -92,8 +93,7 @@ class LivewireLashAbility extends TriggeredAbilityImpl<LivewireLashAbility> {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getType() == EventType.TARGETED && event.getTargetId().equals(sourceId)) {
-            if (game.getCard(event.getSourceId()).getCardType().contains(CardType.SORCERY) ||
-					game.getCard(event.getSourceId()).getCardType().contains(CardType.INSTANT)) {
+            if (game.getObject(event.getSourceId()) instanceof Spell) {
                 return true;
             }
         }
@@ -104,4 +104,4 @@ class LivewireLashAbility extends TriggeredAbilityImpl<LivewireLashAbility> {
     public String getRule() {
         return "Whenever this creature becomes the target of a spell, this creature deals 2 damage to target creature or player.";
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java
index c1b8c2aeec5..5f1d0bd73d1 100644
--- a/Mage/src/mage/filter/FilterObject.java
+++ b/Mage/src/mage/filter/FilterObject.java
@@ -30,7 +30,6 @@ package mage.filter;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.MageObject;
 import mage.ObjectColor;