external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-12 08:48:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

TriggerDrawn consolidate NotFirstCardInDrawStep into FirstCardInDrawStep

Browse Source
This commit is contained in:
Northmoc
2022-04-14 22:25:28 -04:00
parent 813fef50d5
commit e5bbfa1d36
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
View File

@@ -89,17 +89,16 @@ public class TriggerDrawn extends Trigger {
if (hasParam("FirstCardInDrawStep")) {
final Player p = ((Player)runParams.get(AbilityKey.Player));
if (getParam("FirstCardInDrawStep").equals("True")) {
if (!game.getPhaseHandler().is(PhaseType.DRAW, p) || p.numDrawnThisDrawStep() > 1) {
return false;
}
}
if (hasParam("NotFirstCardInDrawStep")) {
final Player p = ((Player)runParams.get(AbilityKey.Player));
} else {
if (p.numDrawnThisDrawStep() == 1 && game.getPhaseHandler().is(PhaseType.DRAW, p)) {
return false;
}
}
}
// trigger should not happen while Mulligan
if (game.getAge() == GameStage.Mulligan) {