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

Fix compile errors from merged fix for poison counters

Browse Source
This commit is contained in:
drdev
2015-11-24 20:29:20 +00:00
parent 52da367894
commit 17df1c17b6
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -890,9 +890,6 @@ public class Player extends GameEntity implements Comparable<Player> {
final int newValue = addAmount + oldValue;
counters.put(counterType, newValue);
view.updateCounters(this);
if (counterType.equals(CounterType.POISON)) {
view.updatePoisonCounters(this);
}
if (fireEvents) {
getGame().fireEvent(new GameEventPlayerCounters(this, counterType, oldValue, newValue));
@@ -926,9 +923,6 @@ public class Player extends GameEntity implements Comparable<Player> {
else {
counters.remove(counterName);
}
if (counterName.equals(CounterType.POISON)) {
view.updatePoisonCounters(this);
}
view.updateCounters(this);
getGame().fireEvent(new GameEventPlayerCounters(this, counterName, oldValue, newValue));
@@ -949,16 +943,12 @@ public class Player extends GameEntity implements Comparable<Player> {
if (counters.isEmpty()) { return; }
counters.clear();
view.updateCounters(this);
view.updatePoisonCounters(this);
getGame().fireEvent(new GameEventPlayerCounters(this, null, 0, 0));
}
public void setCounters(final CounterType counterType, final Integer num) {
counters.put(counterType, num);
view.updateCounters(this);
if (counterType.equals(CounterType.POISON)) {
view.updatePoisonCounters(this);
}
getGame().fireEvent(new GameEventPlayerCounters(this, counterType, 0, 0));
}
@@ -966,7 +956,6 @@ public class Player extends GameEntity implements Comparable<Player> {
public void setCounters(Map<CounterType, Integer> allCounters) {
counters = allCounters;
view.updateCounters(this);
view.updatePoisonCounters(this);
getGame().fireEvent(new GameEventPlayerCounters(this, null, 0, 0));
}