github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Ward countering wrong ability (fixes #8378)

Browse source
This commit is contained in:
Daniel Bomar 2021-10-17 19:08:50 -05:00
parent bcac7bd47c
commit aa96a4af86
No known key found for this signature in database
GPG key ID: C86C8658F4023918
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/main/java/mage/abilities/keyword/WardAbility.java
View file

@ -8,6 +8,7 @@ import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.stack.StackObject; import mage.game.stack.StackObject;
import mage.target.Target;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil; import mage.util.CardUtil;
@ -33,16 +34,29 @@ public class WardAbility extends TriggeredAbilityImpl {
return event.getType() == GameEvent.EventType.TARGETED; return event.getType() == GameEvent.EventType.TARGETED;
} }
private StackObject getTargetingObject(GameEvent event, Game game) {
for (StackObject stackObject : game.getStack()) {
if (stackObject.getId().equals(event.getSourceId()) || stackObject.getSourceId().equals(event.getSourceId())) {
for (Target target : stackObject.getStackAbility().getTargets()) {
if (target.contains(getSourceId())) {
return stackObject;
}
}
}
}
return null;
}
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (!getSourceId().equals(event.getTargetId())) { if (!getSourceId().equals(event.getTargetId())) {
return false; return false;
} }
StackObject stackObject = game.getStack().getStackObject(event.getSourceId()); StackObject stackObject = getTargetingObject(event, game);
if (stackObject == null || !game.getOpponents(getControllerId()).contains(stackObject.getControllerId())) { if (stackObject == null || !game.getOpponents(getControllerId()).contains(stackObject.getControllerId())) {
return false; return false;
} }
getEffects().setTargetPointer(new FixedTarget(event.getSourceId(), game)); getEffects().setTargetPointer(new FixedTarget(stackObject.getId(), game));
return true; return true;
} }