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

fixed GainControl AF not returning all controlled objects (Issue #227)

Browse Source
This commit is contained in:
ArsenalNut
2011-09-06 01:35:14 +00:00
parent cd954ebdd1
commit e8c682bbd3
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/forge/card/abilityFactory/AbilityFactory_GainControl.java
View File

@@ -3,6 +3,7 @@ package forge.card.abilityFactory;
import forge.*; import forge.*;
import forge.card.cardFactory.CardFactoryUtil; import forge.card.cardFactory.CardFactoryUtil;
import forge.card.spellability.*; import forge.card.spellability.*;
import forge.card.trigger.Trigger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -489,37 +490,39 @@ public class AbilityFactory_GainControl {
* @return a {@link forge.Command} object. * @return a {@link forge.Command} object.
*/ */
private Command getLoseControlCommand(final int i, final Player originalController) { private Command getLoseControlCommand(final int i, final Player originalController) {
final Card c = movedCards[i];
final Command loseControl = new Command() { final Command loseControl = new Command() {
private static final long serialVersionUID = 878543373519872418L; private static final long serialVersionUID = 878543373519872418L;
public void execute() { public void execute() {
Card c = movedCards[i]; doLoseControl(c, hostCard, bTapOnLose, kws);
//ArrayList<Card> c = hostCard.getGainControlTargets();
if (null == c) {
return;
}
if (AllZoneUtil.isCardInPlay(c)) {
c.removeController(hostCard);
//AllZone.getGameAction().changeController(new CardList(c), c.getController(), originalController);
if (bTapOnLose) {
c.tap();
}
if (null != kws) {
for (String kw : kws) {
c.removeExtrinsicKeyword(kw);
}
}
} //if
hostCard.clearGainControlTargets();
hostCard.clearGainControlReleaseCommands();
movedCards[i] = null;
} //execute() } //execute()
}; };
return loseControl; return loseControl;
} }
private static void doLoseControl(final Card c, final Card host, final boolean tapOnLose, final ArrayList<String> addedKeywords)
{
if (null == c) {
return;
}
if (AllZoneUtil.isCardInPlay(c)) {
c.removeController(host);
//AllZone.getGameAction().changeController(new CardList(c), c.getController(), originalController);
if (tapOnLose) {
c.tap();
}
if (null != addedKeywords) {
for (String kw : addedKeywords) {
c.removeExtrinsicKeyword(kw);
}
}
} //if
host.clearGainControlTargets();
host.clearGainControlReleaseCommands();
}
} //end class AbilityFactory_GainControl } //end class AbilityFactory_GainControl