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

- Fixed LoseControlCommand in AF GainControl.

Browse Source
This commit is contained in:
Sloth
2012-06-08 14:40:41 +00:00
parent ca22a1b126
commit 3708e03458
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/forge/card/abilityfactory/AbilityFactoryGainControl.java
View File

@@ -450,16 +450,16 @@ public class AbilityFactoryGainControl {
if (this.lose != null) { if (this.lose != null) {
if (this.lose.contains("LeavesPlay")) { if (this.lose.contains("LeavesPlay")) {
this.hostCard.addLeavesPlayCommand(this.getLoseControlCommand(tgtC, originalController)); this.hostCard.addLeavesPlayCommand(this.getLoseControlCommand(tgtC, originalController, newController));
} }
if (this.lose.contains("Untap")) { if (this.lose.contains("Untap")) {
this.hostCard.addUntapCommand(this.getLoseControlCommand(tgtC, originalController)); this.hostCard.addUntapCommand(this.getLoseControlCommand(tgtC, originalController, newController));
} }
if (this.lose.contains("LoseControl")) { if (this.lose.contains("LoseControl")) {
this.hostCard.addChangeControllerCommand(this.getLoseControlCommand(tgtC, originalController)); this.hostCard.addChangeControllerCommand(this.getLoseControlCommand(tgtC, originalController, newController));
} }
if (this.lose.contains("EOT")) { if (this.lose.contains("EOT")) {
AllZone.getEndOfTurn().addAt(this.getLoseControlCommand(tgtC, originalController)); AllZone.getEndOfTurn().addAt(this.getLoseControlCommand(tgtC, originalController, newController));
} }
} }
@@ -476,7 +476,7 @@ public class AbilityFactoryGainControl {
} }
this.hostCard.clearGainControlReleaseCommands(); this.hostCard.clearGainControlReleaseCommands();
this.hostCard.addGainControlReleaseCommand(this.getLoseControlCommand(tgtC, originalController)); this.hostCard.addGainControlReleaseCommand(this.getLoseControlCommand(tgtC, originalController, newController));
} // end foreach target } // end foreach target
} }
@@ -590,14 +590,15 @@ public class AbilityFactoryGainControl {
* a {@link forge.game.player.Player} object. * a {@link forge.game.player.Player} object.
* @return a {@link forge.Command} object. * @return a {@link forge.Command} object.
*/ */
private Command getLoseControlCommand(final Card c, final Player originalController) { private Command getLoseControlCommand(final Card c, final Player originalController, final GameEntity newController) {
final Command loseControl = new Command() { final Command loseControl = new Command() {
private static final long serialVersionUID = 878543373519872418L; private static final long serialVersionUID = 878543373519872418L;
@Override @Override
public void execute() { public void execute() {
AbilityFactoryGainControl.doLoseControl(c, AbilityFactoryGainControl.this.hostCard, AbilityFactoryGainControl.doLoseControl(c, AbilityFactoryGainControl.this.hostCard,
AbilityFactoryGainControl.this.bTapOnLose, AbilityFactoryGainControl.this.kws); AbilityFactoryGainControl.this.bTapOnLose, AbilityFactoryGainControl.this.kws,
newController);
} // execute() } // execute()
}; };
@@ -605,12 +606,12 @@ public class AbilityFactoryGainControl {
} }
private static void doLoseControl(final Card c, final Card host, final boolean tapOnLose, private static void doLoseControl(final Card c, final Card host, final boolean tapOnLose,
final ArrayList<String> addedKeywords) { final ArrayList<String> addedKeywords, final GameEntity newController) {
if (null == c) { if (null == c) {
return; return;
} }
if (AllZoneUtil.isCardInPlay(c)) { if (AllZoneUtil.isCardInPlay(c)) {
c.removeController(host); c.removeController(newController);
// Singletons.getModel().getGameAction().changeController(new CardList(c), // Singletons.getModel().getGameAction().changeController(new CardList(c),
// c.getController(), originalController); // c.getController(), originalController);