From 3b5ad985b97b62e54efca6ffc8a007d344d1dbab Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 03:22:38 +0000
Subject: [PATCH] Added addDamage(player, source, damage) Moved LifeLink check
 and Guilty Conscience check to addDamage

---
 src/forge/GameAction.java | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index 6c3e75cc7a0..2de3f43802a 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -1568,6 +1568,7 @@ private int getDifferentLand(CardList list, String land)
 			ability2.setStackDescription(source.getName() + " - gets a +1/+1 counter");
 			AllZone.Stack.add(ability2);
 	  }
+      
 	  if (source.getKeyword().contains("Deathtouch"))
 	  {
 		  AllZone.GameAction.destroy(card);
@@ -1617,6 +1618,16 @@ private int getDifferentLand(CardList list, String land)
 	  System.out.println("Adding " + damageToAdd + " damage to " + card.getName());
 	  if (isCardInPlay(card))
 		  card.addDamage(damageToAdd, source);
+	  
+	  if (source.getKeyword().contains("Lifelink"))
+	   	   GameActionUtil.executeLifeLinkEffects(source, damageToAdd);
+	  
+	  CardList cl = CardFactoryUtil.getAurasEnchanting(source, "Guilty Conscience");
+	   for (Card c : cl)
+	   {
+		   GameActionUtil.executeGuiltyConscienceEffects(source, c, damageToAdd);
+	   }
+
   }
   
   /*
@@ -1671,6 +1682,20 @@ private int getDifferentLand(CardList list, String land)
      getPlayerLife(player).subtractLife(damage);
   }
 
+  public void addDamage(String player, Card source, int damage)
+  {
+      getPlayerLife(player).subtractLife(damage);
+      
+	  if (source.getKeyword().contains("Lifelink"))
+     	 GameActionUtil.executeLifeLinkEffects(source, damage);
+
+      CardList cl = CardFactoryUtil.getAurasEnchanting(source, "Guilty Conscience");
+      for (Card c : cl)
+      {
+    	  GameActionUtil.executeGuiltyConscienceEffects(source, c, damage);
+      }
+
+  }
 
   public static void main(String[] args)
   {