External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[M21] actually fix Enthralling Hold (#6746)

Browse source
This commit is contained in:
htrajan 2020-06-29 01:41:46 -07:00 • committed by GitHub
parent 4652ebd790
commit ca29e61b1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 110 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/target/Target.java
View file

@ -52,6 +52,8 @@ public interface Target extends Serializable {
boolean canTarget(UUID id, Ability source, Game game);
boolean stillLegalTarget(UUID id, Ability source, Game game);
boolean canTarget(UUID playerId, UUID id, Ability source, Game game);
boolean isLegal(Ability source, Game game);

16
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -12,7 +12,14 @@ import mage.game.events.GameEvent.EventType;
import mage.players.Player;
import mage.util.RandomUtil;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
/**
* @author BetaSteward_at_googlemail.com
@ -337,7 +344,7 @@ public abstract class TargetImpl implements Target {
illegalTargets.add(targetId);
continue;
}
if (!canTarget(targetId, source, game)) {
if (!stillLegalTarget(targetId, source, game)) {
illegalTargets.add(targetId);
}
}
@ -473,6 +480,11 @@ public abstract class TargetImpl implements Target {
return null;
}
@Override
public boolean stillLegalTarget(UUID id, Ability source, Game game) {
return canTarget(id, source, game);
}
@Override
public void setNotTarget(boolean notTarget) {
this.notTarget = notTarget;