github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing comments and missed checkes to NthTargetPointer

Browse source
This commit is contained in:
Alex Vasile 2022-10-09 22:55:23 -03:00
parent 10ac777a28
commit 1233fe89e5
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/target/targetpointer/NthTargetPointer.java
View file

@ -19,7 +19,7 @@ public abstract class NthTargetPointer extends TargetPointerImpl {
private static final List<UUID> emptyTargets = Collections.unmodifiableList(new ArrayList<>(0)); private static final List<UUID> emptyTargets = Collections.unmodifiableList(new ArrayList<>(0));
private Map<UUID, Integer> zoneChangeCounter; private Map<UUID, Integer> zoneChangeCounter;
private int targetNumber; private final int targetNumber;
public NthTargetPointer(int targetNumber) { public NthTargetPointer(int targetNumber) {
super(); super();
@ -66,6 +66,7 @@ public abstract class NthTargetPointer extends TargetPointerImpl {
if (card != null if (card != null
&& getZoneChangeCounter().containsKey(targetId) && getZoneChangeCounter().containsKey(targetId)
&& card.getZoneChangeCounter(game) != getZoneChangeCounter().get(targetId)) { && card.getZoneChangeCounter(game) != getZoneChangeCounter().get(targetId)) {
// But no longer if new permanent is already on the battlefield
Permanent permanent = game.getPermanentOrLKIBattlefield(targetId); Permanent permanent = game.getPermanentOrLKIBattlefield(targetId);
if (permanent == null || permanent.getZoneChangeCounter(game) != getZoneChangeCounter().get(targetId)) { if (permanent == null || permanent.getZoneChangeCounter(game) != getZoneChangeCounter().get(targetId)) {
continue; continue;
@ -88,7 +89,13 @@ public abstract class NthTargetPointer extends TargetPointerImpl {
Card card = game.getCard(targetId); Card card = game.getCard(targetId);
if (card != null && getZoneChangeCounter().containsKey(targetId) if (card != null && getZoneChangeCounter().containsKey(targetId)
&& card.getZoneChangeCounter(game) != getZoneChangeCounter().get(targetId)) { && card.getZoneChangeCounter(game) != getZoneChangeCounter().get(targetId)) {
return null;
// Because if dies trigger has to trigger as permanent has already moved zone, we have to check if target was on the battlefield immed. before
// but no longer if new permanent is already on the battlefield
Permanent permanent = game.getPermanentOrLKIBattlefield(targetId);
if (permanent == null || permanent.getZoneChangeCounter(game) != zoneChangeCounter.get(targetId)) {
return null;
}
} }
} }
return targetId; return targetId;