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

- Fixed the loseControl commands in AF GainControl.

Browse Source
This commit is contained in:
Sloth
2011-11-17 16:05:20 +00:00
parent 0bb457fd76
commit 51e56dbdda
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ import forge.Command;
import forge.ComputerUtil; import forge.ComputerUtil;
import forge.Constant; import forge.Constant;
import forge.Constant.Zone; import forge.Constant.Zone;
import forge.GameEntity;
import forge.Player; import forge.Player;
import forge.card.cardfactory.CardFactoryUtil; import forge.card.cardfactory.CardFactoryUtil;
import forge.card.spellability.Ability; import forge.card.spellability.Ability;
@@ -379,14 +380,22 @@ public class AbilityFactoryGainControl {
tgtCards = AbilityFactory.getDefinedCards(this.hostCard, this.params.get("Defined"), sa); tgtCards = AbilityFactory.getDefinedCards(this.hostCard, this.params.get("Defined"), sa);
} }
// tgtCards.add(hostCard); // tgtCards.add(hostCard);
ArrayList<Player> controllers = new ArrayList<Player>();
ArrayList<Player> newController = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), if (params.containsKey("NewController")) {
this.params.get("NewController"), sa); controllers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(),
if (tgt != null && tgt.getTargetPlayers() != null) { this.params.get("NewController"), sa);
newController = tgt.getTargetPlayers(); } else if (tgt != null && tgt.getTargetPlayers() != null && tgt.canTgtPlayer()) {
controllers = tgt.getTargetPlayers();
} }
if (newController.size() == 0) {
newController.add(sa.getActivatingPlayer()); GameEntity newController;
if (controllers.size() == 0) {
newController = this.hostCard;
} else {
newController = controllers.get(0);
} }
final int size = tgtCards.size(); final int size = tgtCards.size();
@@ -401,13 +410,7 @@ public class AbilityFactoryGainControl {
if (AllZoneUtil.isCardInPlay(tgtC) && tgtC.canBeTargetedBy(sa)) { if (AllZoneUtil.isCardInPlay(tgtC) && tgtC.canBeTargetedBy(sa)) {
if (this.params.containsKey("NewController")) { tgtC.addController(newController);
tgtC.addController(newController.get(0));
} else if (tgt != null && tgt.getTargetPlayers() != null) {
tgtC.addController(newController.get(0));
} else {
tgtC.addController(this.hostCard);
}
// AllZone.getGameAction().changeController(new CardList(tgtC), // AllZone.getGameAction().changeController(new CardList(tgtC),
// tgtC.getController(), newController.get(0)); // tgtC.getController(), newController.get(0));