external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes in Player.addDamage

Browse Source
This commit is contained in:
jendave
2011-08-06 09:58:49 +00:00
parent 51e44deaa9
commit 5e40cda717
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/forge/Player.java
View File

@@ -142,7 +142,7 @@ public abstract class Player extends MyObservable{
damageToDo = 0; damageToDo = 0;
if( source.getKeyword().contains("Infect") ) { if( source.getKeyword().contains("Infect") ) {
addPoisonCounters(damage); addPoisonCounters(damageToDo);
} }
else { else {
if(PlayerUtil.worshipFlag(this) && life <= damageToDo) { if(PlayerUtil.worshipFlag(this) && life <= damageToDo) {
@@ -151,7 +151,7 @@ public abstract class Player extends MyObservable{
subtractLife(damageToDo, source); 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"); CardList cl = CardFactoryUtil.getAurasEnchanting(source, "Guilty Conscience");
for(Card c:cl) { for(Card c:cl) {