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

9
Mage/src/main/java/mage/watchers/common/LandfallWatcher.java
View file

@ -1,14 +1,15 @@
package mage.watchers.common;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.watchers.Watcher;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
/**
* @author BetaSteward_at_googlemail.com
* @author Loki
@ -37,9 +38,9 @@ public class LandfallWatcher extends Watcher {
@Override
public void reset() {
super.reset();
playerPlayedLand.clear();
landEnteredBattlefield.clear();
super.reset();
}
public boolean landPlayed(UUID playerId) {