From 8f971f28b90934706f4ce7a243eee8fe93d4e13f Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Tue, 14 Jun 2011 19:46:50 +0300
Subject: [PATCH] Improved LoseLifeControllerEffect Used
 LoseLifeControllerEffect for VaporSnag

---
 .../src/mage/sets/newphyrexia/VaporSnag.java  | 42 +------------------
 .../common/LoseLifeControllerEffect.java      | 38 +++++++++++++----
 2 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java
index 01e13137dc..9c3b41ffe9 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/VaporSnag.java
@@ -30,16 +30,11 @@ package mage.sets.newphyrexia;
 
 import java.util.UUID;
 
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.abilities.Ability;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.LoseLifeControllerEffect;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-import mage.players.Player;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -53,7 +48,7 @@ public class VaporSnag extends CardImpl<VaporSnag> {
         this.expansionSetCode = "NPH";
 		this.color.setBlue(true);
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addEffect(new VaporSnagEffect());
+        this.getSpellAbility().addEffect(new LoseLifeControllerEffect(1));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
@@ -66,36 +61,3 @@ public class VaporSnag extends CardImpl<VaporSnag> {
         return new VaporSnag(this);
     }
 }
-
-class VaporSnagEffect extends OneShotEffect<VaporSnagEffect> {
-    VaporSnagEffect() {
-        super(Constants.Outcome.Damage);
-    }
-
-    VaporSnagEffect(final VaporSnagEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Permanent p = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(source), Constants.Zone.BATTLEFIELD);
-        if (p != null) {
-            Player controller = game.getPlayer(p.getControllerId());
-            if (controller != null) {
-                controller.loseLife(1, game);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public VaporSnagEffect copy() {
-        return new VaporSnagEffect(this);
-    }
-
-    @Override
-    public String getText(Ability source) {
-        return "Its controller loses 1 life";
-    }
-}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java b/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java
index 9efe67f96a..d1dbe33099 100644
--- a/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java
+++ b/Mage/src/mage/abilities/effects/common/LoseLifeControllerEffect.java
@@ -1,10 +1,34 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
 package mage.abilities.effects.common;
 
 import mage.Constants.Outcome;
+import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.game.Game;
@@ -35,11 +59,11 @@ public class LoseLifeControllerEffect extends OneShotEffect<LoseLifeControllerEf
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent targetPermanent = game.getPermanent(source.getFirstTarget());
+        Permanent targetPermanent = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(source), Zone.BATTLEFIELD);
         if (targetPermanent != null) {
-            Player player = game.getPlayer(targetPermanent.getControllerId());
-            if (player != null) {
-                player.loseLife(amount, game);
+            Player controller = game.getPlayer(targetPermanent.getControllerId());
+            if (controller != null) {
+                controller.loseLife(amount, game);
                 return true;
             }
         }