fix conflicts

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

View file

@ -1,22 +1,20 @@
package mage.watchers.common;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import mage.constants.PhaseStep;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.watchers.Watcher;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
/**
* @author LevelX2
*
* Counts cards drawn during draw step
* <p>
* Counts cards drawn during draw step
*/
public class CardsDrawnDuringDrawStepWatcher extends Watcher {
@ -47,6 +45,7 @@ public class CardsDrawnDuringDrawStepWatcher extends Watcher {
@Override
public void reset() {
super.reset();
amountOfCardsDrawnThisTurn.clear();
}