Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatically pass if stack is empty and pass priority is true

master
melvin 2011-06-04 16:54:32 +08:00
parent 47363e56d2
commit c09a25de02
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/magic/model/choice/MagicPlayChoice.java
View File

@ -27,7 +27,6 @@ public class MagicPlayChoice extends MagicChoice {
private static final Object PASS_CHOICE_RESULTS[]=new Object[]{MagicPlayChoiceResult.PASS};
private MagicPlayChoice() {
super("Choose a card or ability to play.");
}
@ -88,9 +87,13 @@ public class MagicPlayChoice extends MagicChoice {
} else {
validChoices=getValidChoices(game,player);
}
if (validChoices.isEmpty()&&game.canSkipSingleChoice()) {
if (validChoices.isEmpty() && game.canSkipSingleChoice()) {
return PASS_CHOICE_RESULTS;
}
if (game.getStack().isEmpty() && game.getPassPriority()) {
return PASS_CHOICE_RESULTS;
}
controller.focusViewers(0,0);
if (validChoices.isEmpty()) {
@ -140,4 +143,4 @@ public class MagicPlayChoice extends MagicChoice {
return INSTANCE;
}
}
}