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

make cleanup a member of the class, simplify doAction method

master
melvin 2013-07-09 11:21:02 +08:00
parent 3cb9e64ef8
commit b700bf1ccc
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/magic/model/action/MagicDetainAction.java
View File

@ -31,6 +31,17 @@ public class MagicDetainAction extends MagicAction {
flags.add(MagicAbility.CantActivateAbilities);
}
};
private final MagicAtUpkeepTrigger Cleanup = new MagicAtUpkeepTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {
if (upkeepPlayer.getId() == sourceController.getId()) {
game.addDelayedAction(new MagicRemoveStaticAction(permanent, Detain));
game.addDelayedAction(new MagicRemoveTriggerAction(permanent, this));
}
return MagicEvent.NONE;
}
};
public MagicDetainAction(final MagicPlayer controller, final MagicPermanent aPermanent) {
sourceController = controller;
@ -40,17 +51,7 @@ public class MagicDetainAction extends MagicAction {
@Override
public void doAction(final MagicGame game) {
game.doAction(new MagicAddStaticAction(permanent, Detain));
final MagicAtUpkeepTrigger cleanup = new MagicAtUpkeepTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {
if (upkeepPlayer.getId() == sourceController.getId()) {
game.addDelayedAction(new MagicRemoveStaticAction(permanent, Detain));
game.addDelayedAction(new MagicRemoveTriggerAction(permanent, this));
}
return MagicEvent.NONE;
}
};
game.doAction(new MagicAddTriggerAction(permanent, cleanup));
game.doAction(new MagicAddTriggerAction(permanent, Cleanup));
}
@Override