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

- Fixed Battalion Triggers check requirements when resolving

Browse Source
This commit is contained in:
swordshine
2013-12-23 02:58:10 +00:00
parent dc16b75c94
commit 77de4abfd1
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -344,8 +344,9 @@ public class WrappedAbility extends Ability implements ISpellAbility {
@Override
public void resolve() {
final Game game = sa.getActivatingPlayer().getGame();
Map<String, String> triggerParams = regtrig.getMapParams();
if (!(regtrig instanceof TriggerAlways)) {
if (!(regtrig instanceof TriggerAlways) && !triggerParams.containsKey("NoResolvingCheck")) {
// State triggers don't have "Intervening If"
if (!regtrig.requirementsCheck(game)) {
return;
@@ -353,7 +354,6 @@ public class WrappedAbility extends Ability implements ISpellAbility {
}
TriggerHandler th = game.getTriggerHandler();
Map<String, String> triggerParams = regtrig.getMapParams();
if (decider != null && !decider.getController().confirmTrigger(sa, regtrig, triggerParams, this.isMandatory())) {
return;