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

Fix several card abilities incorrectly implemented as intervening-if abilities when they weren't

Browse source
This commit is contained in:
Alex W. Jackson 2022-09-09 04:47:07 -04:00
parent ec3573a786
commit 076c55f1ea
12 changed files with 128 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/main/java/mage/abilities/condition/common/AttackedThisTurnCondition.java
View file

@ -1,20 +0,0 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
import mage.watchers.common.AttackedThisTurnWatcher;
/**
*
* @author LevelX2
*/
public enum AttackedThisTurnCondition implements Condition {
instance;
@Override
public boolean apply(Game game, Ability source) {
AttackedThisTurnWatcher watcher = game.getState().getWatcher(AttackedThisTurnWatcher.class);
return watcher != null && !watcher.getAttackedThisTurnCreatures().isEmpty();
}
}

21
Mage/src/main/java/mage/abilities/condition/common/ControllerAttackedThisTurnCondition.java
View file

@ -1,21 +0,0 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
import mage.watchers.common.AttackedThisTurnWatcher;
/**
*
* @author LevelX2
*/
public enum ControllerAttackedThisTurnCondition implements Condition {
instance;
@Override
public boolean apply(Game game, Ability source) {
AttackedThisTurnWatcher watcher = game.getState().getWatcher(AttackedThisTurnWatcher.class);
return source.isControlledBy(game.getActivePlayerId()) && watcher != null && !watcher.getAttackedThisTurnCreatures().isEmpty();
}
}