BlocksSourceTriggeredAbility now triggers only once when the source somehow blocks multiple creatures. Cards that need the other way now use BlocksCreatureTriggeredAbility instead. Fixes #8874. Fixes #8875.

This commit is contained in:
Alex W. Jackson 2022-04-24 05:35:01 -04:00
parent 212bb075ee
commit 62655793da
40 changed files with 188 additions and 192 deletions

View file

@ -1,4 +1,3 @@
package mage.abilities.common;
import mage.constants.Zone;
@ -6,7 +5,7 @@ import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.target.targetpointer.FixedTarget;
import mage.game.permanent.Permanent;
/**
*
@ -14,50 +13,32 @@ import mage.target.targetpointer.FixedTarget;
*/
public class BlocksSourceTriggeredAbility extends TriggeredAbilityImpl {
private boolean setTargetPointer;
private boolean once = false;
public BlocksSourceTriggeredAbility(Effect effect) {
this(effect, false);
}
public BlocksSourceTriggeredAbility(Effect effect, boolean optional) {
this(effect, optional, false);
}
public BlocksSourceTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer) {
this(effect, optional, setTargetPointer, false);
}
public BlocksSourceTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer, boolean once) {
super(Zone.BATTLEFIELD, effect, optional);
this.setTargetPointer = setTargetPointer;
this.once = once;
}
public BlocksSourceTriggeredAbility(final BlocksSourceTriggeredAbility ability) {
super(ability);
this.setTargetPointer = ability.setTargetPointer;
this.once = ability.once;
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.BLOCKER_DECLARED;
return event.getType() == GameEvent.EventType.DECLARED_BLOCKERS;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getSourceId().equals(this.getSourceId())) {
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getTargetId()));
}
}
return true;
}
return false;
Permanent permanent = game.getPermanent(getSourceId());
return permanent != null && permanent.getBlocking() > 0;
}
@Override
public String getTriggerPhrase() {
return "When" + (once ? "" : "ever") + " {this} blocks" + (setTargetPointer ? " a creature, " : ", ") ;
return "Whenever {this} blocks, ";
}
@Override