From 5e40cda717d6b76b5bf96737e2bedceaa015ed02 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:58:49 +0000 Subject: [PATCH] minor fixes in Player.addDamage --- src/forge/Player.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Player.java b/src/forge/Player.java index 37eee7fb5e5..e2023fe969f 100644 --- a/src/forge/Player.java +++ b/src/forge/Player.java @@ -142,7 +142,7 @@ public abstract class Player extends MyObservable{ damageToDo = 0; if( source.getKeyword().contains("Infect") ) { - addPoisonCounters(damage); + addPoisonCounters(damageToDo); } else { if(PlayerUtil.worshipFlag(this) && life <= damageToDo) { @@ -151,7 +151,7 @@ public abstract class Player extends MyObservable{ subtractLife(damageToDo, source); } - if(source.getKeyword().contains("Lifelink")) GameActionUtil.executeLifeLinkEffects(source, damage); + if(source.getKeyword().contains("Lifelink")) GameActionUtil.executeLifeLinkEffects(source, damageToDo); CardList cl = CardFactoryUtil.getAurasEnchanting(source, "Guilty Conscience"); for(Card c:cl) {