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

PlayerController.playSaNoStack - removed obvious parameter (player)

Browse Source
This commit is contained in:
Maxmtg
2013-07-06 23:28:37 +00:00
parent 191a8e4e43
commit c8524485bb
8 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/Card.java
View File

@@ -7299,7 +7299,7 @@ public class Card extends GameEntity implements Comparable<Card> {
cardsInCommand = this.getGame().getCardsIn(ZoneType.Command);
}
this.getController().getController().playSpellAbilityNoStack(this.getController(), shieldSA);
this.getController().getController().playSpellAbilityNoStack(shieldSA);
if (apiIsEffect) {
List<Card> newCardsInCommand = this.getGame().getCardsIn(ZoneType.Command);
newCardsInCommand.removeAll(cardsInCommand);

2
src/main/java/forge/card/replacement/ReplacementHandler.java
View File

@@ -238,7 +238,7 @@ public class ReplacementHandler {
}
Player player = replacementEffect.getHostCard().getController();
player.getController().playSpellAbilityNoStack(player, effectSA);
player.getController().playSpellAbilityNoStack(effectSA);
return ReplacementResult.Replaced;
}

9
src/main/java/forge/game/GameAction.java
View File

@@ -60,7 +60,6 @@ import forge.card.staticability.StaticAbility;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerType;
import forge.card.trigger.ZCTrigger;
import forge.game.ai.ComputerUtil;
import forge.game.event.GameEventCardChangeZone;
import forge.game.event.GameEventCardDestroyed;
import forge.game.event.GameEventCardRegenerated;
@@ -70,7 +69,6 @@ import forge.game.event.GameEventGameFinished;
import forge.game.event.GameEventFlipCoin;
import forge.game.event.GameEventGameStarted;
import forge.game.player.GameLossReason;
import forge.game.player.HumanPlay;
import forge.game.player.Player;
import forge.game.player.PlayerController.ManaPaymentPurpose;
import forge.game.zone.PlayerZone;
@@ -1658,11 +1656,8 @@ public class GameAction {
for(final SpellAbility sa : usableFromOpeningHand ) {
if (!takesAction.getZone(ZoneType.Hand).contains(sa.getSourceCard()))
continue;
if (takesAction.isHuman())
HumanPlay.playSpellAbilityNoStack(takesAction, sa);
else
ComputerUtil.playNoStack(takesAction, sa, game);
takesAction.getController().playSpellAbilityNoStack(sa);
}
takesAction = game.getNextPlayerAfter(takesAction);
} while( takesAction != first );

1
src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -32,7 +32,6 @@ import com.google.common.collect.Lists;
import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
import forge.Command;
import forge.Constant;
import forge.GameEntity;
import forge.card.CardType;

2
src/main/java/forge/game/player/Player.java
View File

@@ -915,7 +915,7 @@ public class Player extends GameEntity implements Comparable<Player> {
cardsInCommand = this.getGame().getCardsIn(ZoneType.Command);
}
this.getController().playSpellAbilityNoStack(this, shieldSA);
this.getController().playSpellAbilityNoStack(shieldSA);
if (apiIsEffect) {
List<Card> newCardsInCommand = this.getGame().getCardsIn(ZoneType.Command);
newCardsInCommand.removeAll(cardsInCommand);

2
src/main/java/forge/game/player/PlayerController.java
View File

@@ -96,7 +96,7 @@ public abstract class PlayerController {
//public abstract void playFromSuspend(Card c);
public abstract boolean playCascade(Card cascadedCard, Card sourceCard);
public abstract void playSpellAbilityForFree(SpellAbility copySA, boolean mayChoseNewTargets);
public abstract void playSpellAbilityNoStack(Player player, SpellAbility effectSA);
public abstract void playSpellAbilityNoStack(SpellAbility effectSA);
public abstract Deck sideboard(final Deck deck, GameType gameType);

2
src/main/java/forge/game/player/PlayerControllerAi.java
View File

@@ -249,7 +249,7 @@ public class PlayerControllerAi extends PlayerController {
}
@Override
public void playSpellAbilityNoStack(Player player, SpellAbility effectSA) {
public void playSpellAbilityNoStack(SpellAbility effectSA) {
ComputerUtil.playNoStack(player, effectSA, game);
}

2
src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -122,7 +122,7 @@ public class PlayerControllerHuman extends PlayerController {
}
@Override
public void playSpellAbilityNoStack(Player player, SpellAbility effectSA) {
public void playSpellAbilityNoStack(SpellAbility effectSA) {
HumanPlay.playSpellAbilityNoStack(player, effectSA);
}