Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

fix conflicts

Browse source
This commit is contained in:
Ingmar Goudt 2019-12-29 19:28:20 +01:00
commit ce23f6900d
2451 changed files with 84128 additions and 14873 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java
View file

@ -1,16 +1,16 @@
package mage.watchers.common;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
import mage.watchers.Watcher;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
/*
* Counts amount of life lost current or last turn by players.
* This watcher is automatically started in gameImpl.init for each game
@ -63,6 +63,7 @@ public class PlayerLostLifeWatcher extends Watcher {
@Override
public void reset() {
super.reset();
amountOfLifeLostLastTurn.clear();
amountOfLifeLostLastTurn.putAll(amountOfLifeLostThisTurn);
amountOfLifeLostThisTurn.clear();