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

reveting incorrect implmentation of damage dealt by general calculation

Browse Source
This commit is contained in:
Maxmtg
2013-04-02 06:20:21 +00:00
parent 3d57a98d3c
commit 2e98741d87
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/game/player/Player.java
View File

@@ -88,8 +88,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
/** The poison counters. */ /** The poison counters. */
private int poisonCounters = 0; private int poisonCounters = 0;
private int edhGeneralDamage = 0;
/** The life. */ /** The life. */
private int life = 20; private int life = 20;
@@ -644,9 +642,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
} }
this.assignedDamage.put(source, damageToDo); this.assignedDamage.put(source, damageToDo);
if(source.isCommander())
this.edhGeneralDamage+= damageToDo;
GameActionUtil.executeDamageDealingEffects(source, damageToDo); GameActionUtil.executeDamageDealingEffects(source, damageToDo);
GameActionUtil.executeDamageToPlayerEffects(this, source, damageToDo); GameActionUtil.executeDamageToPlayerEffects(this, source, damageToDo);
@@ -2153,10 +2148,6 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
if (hasNoLife && !this.cantLoseForZeroOrLessLife()) { if (hasNoLife && !this.cantLoseForZeroOrLessLife()) {
return this.loseConditionMet(GameLossReason.LifeReachedZero, null); return this.loseConditionMet(GameLossReason.LifeReachedZero, null);
} }
if(this.edhGeneralDamage >= 21) {
return this.loseConditionMet(GameLossReason.EdhGeneralDamage, null);
}
return false; return false;
} }