External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 20:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix Deep Gnome Terramancer triggering out of extra lands played

Browse source
This commit is contained in:
Susucre 2024-04-10 20:52:08 +02:00
parent c3862e7196
commit 113630c1ab
3 changed files with 74 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/watchers/common/PlayLandWatcher.java
View file

@ -1,5 +1,6 @@
package mage.watchers.common;
import mage.MageObjectReference;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -16,7 +17,7 @@ import java.util.UUID;
public class PlayLandWatcher extends Watcher {
private final Set<UUID> playerPlayedLand = new HashSet<>(); // player that played land
private final Set<UUID> landPlayed = new HashSet<>(); // land played
private final Set<MageObjectReference> landPlayed = new HashSet<>(); // land played
public PlayLandWatcher() {
super(WatcherScope.GAME);
@ -26,11 +27,10 @@ public class PlayLandWatcher extends Watcher {
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.LAND_PLAYED) {
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
if (permanent != null
&& permanent.isLand(game)
&& !playerPlayedLand.contains(event.getPlayerId())) {
if (permanent != null && permanent.isLand(game)) {
MageObjectReference mor = new MageObjectReference(permanent, game);
landPlayed.add(mor);
playerPlayedLand.add(event.getPlayerId());
landPlayed.add(event.getTargetId());
}
}
}
@ -46,7 +46,7 @@ public class PlayLandWatcher extends Watcher {
return playerPlayedLand.contains(playerId);
}
public boolean wasLandPlayed(UUID landId) {
return landPlayed.contains(landId);
public boolean wasLandPlayed(Permanent land, Game game) {
return landPlayed.contains(new MageObjectReference(land, game));
}
}