From ae608246d12fc7ff807a2ee85af8db2308dd2ea9 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Tue, 20 Dec 2016 10:18:06 +0000
Subject: [PATCH] - Reverting the lifelink change for now, better solution
 needed.

---
 forge-game/src/main/java/forge/game/card/Card.java     | 6 ++----
 forge-game/src/main/java/forge/game/combat/Combat.java | 4 ++++
 forge-game/src/main/java/forge/game/player/Player.java | 6 ++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 70441e0c342..3b03baed89f 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -6140,10 +6140,8 @@ public class Card extends GameEntity implements Comparable<Card> {
         source.addDealtDamageToThisTurn(this, damageIn);
         if (isCombat) {
             game.getCombat().addDealtDamageTo(source, this);
-        } 
-
-        // Both combat and non-combat lifelink is handled here
-        if (source.hasKeyword("Lifelink")) {
+        } else if (source.hasKeyword("Lifelink")) {
+            // LifeLink not for Combat Damage at this place
             source.getController().gainLife(damageIn, source);
         }
 
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index e9f88aecb62..ec15d0a8c39 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -767,6 +767,10 @@ public class Combat {
         for (final Card damageSource : dealtDamageTo.keySet()) {
             final HashMap<String, Object> runParams = new HashMap<String, Object>();
             int dealtDamage = damageDealtThisCombat.containsKey(damageSource) ? damageDealtThisCombat.get(damageSource) : 0;
+            // LifeLink for Combat Damage at this place
+            if (dealtDamage > 0 && damageSource.hasKeyword("Lifelink")) {
+                damageSource.getController().gainLife(dealtDamage, damageSource);
+            }
             runParams.put("DamageSource", damageSource);
             runParams.put("DamageTargets", dealtDamageTo.get(damageSource));
             runParams.put("DamageAmount", dealtDamage);
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 782f8d82209..ba4fd01a5e9 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -560,10 +560,8 @@ public class Player extends GameEntity implements Comparable<Player> {
             for (final String type : source.getType()) {
                 source.getController().addProwlType(type);
             }
-        } 
-
-        // Both combat and non-combat lifelink is handled here
-        if (source.hasKeyword("Lifelink")) {
+        } else if (source.hasKeyword("Lifelink")) {
+            // LifeLink not for Combat Damage at this place
             source.getController().gainLife(amount, source);
         }