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

when changing control of permanent, remove from combat and set exclude from combat to false 

fixes issue 309
master
melvin 2012-12-17 22:14:57 +08:00
parent 4497467fa5
commit 46046aa291
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/model/action/MagicChangeControlAction.java
View File

@ -32,6 +32,8 @@ public class MagicChangeControlAction extends MagicAction {
curr.addPermanent(perm);
perm.setState(MagicPermanentState.Summoned);
game.doAction(new MagicRemoveFromCombatAction(perm));
game.doAction(new MagicChangeStateAction(perm,MagicPermanentState.ExcludeFromCombat,false));
if (perm.getPairedCreature().isValid()) {;
game.doAction(new MagicSoulbondAction(perm,perm.getPairedCreature(),false));

1
src/magic/model/choice/MagicDeclareBlockersChoice.java
View File

@ -25,7 +25,6 @@ public class MagicDeclareBlockersChoice extends MagicChoice {
private static final String CONTINUE_MESSAGE="Press {f} to continue.";
private MagicDeclareBlockersChoice() {
super("Declare blockers.");
}