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

Revert "Fix token created when removed before trigger resolves"

Browse Source 
This reverts commit e33644ecf3.
This commit is contained in:
Bug Hunter
2021-01-27 21:36:23 +00:00
committed by Hans Mackowiak
parent 22fd1ac274
commit 0f28cbda4f
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
View File

@@ -612,7 +612,7 @@ public class PlayerControllerAi extends PlayerController {
}
@Override
public void playChosenSpellAbility(SpellAbility sa) {
public boolean playChosenSpellAbility(SpellAbility sa) {
// System.out.println("Playing sa: " + sa);
if (sa instanceof LandAbility) {
if (sa.canPlay()) {
@@ -622,6 +622,7 @@ public class PlayerControllerAi extends PlayerController {
} else {
ComputerUtil.handlePlayingSpellAbility(player, sa, getGame());
}
return true;
}
@Override

6
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -1019,13 +1019,13 @@ public class PhaseHandler implements java.io.Serializable {
if (DEBUG_PHASES) {
System.out.print("... " + pPlayerPriority + " plays " + chosenSa);
}
pFirstPriority = pPlayerPriority; // all opponents have to pass before stack is allowed to resolve
for (SpellAbility sa : chosenSa) {
Card saHost = sa.getHostCard();
final Zone originZone = saHost.getZone();
// TODO it has no return value if successful
pPlayerPriority.getController().playChosenSpellAbility(sa);
if (pPlayerPriority.getController().playChosenSpellAbility(sa)) {
pFirstPriority = pPlayerPriority; // all opponents have to pass before stack is allowed to resolve
}
saHost = game.getCardState(saHost);
final Zone currentZone = saHost.getZone();

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

@@ -192,7 +192,7 @@ public abstract class PlayerController {
public abstract void declareAttackers(Player attacker, Combat combat);
public abstract void declareBlockers(Player defender, Combat combat);
public abstract List<SpellAbility> chooseSpellAbilityToPlay();
public abstract void playChosenSpellAbility(SpellAbility sa);
public abstract boolean playChosenSpellAbility(SpellAbility sa);
public abstract CardCollection chooseCardsToDiscardToMaximumHandSize(int numDiscard);
public abstract boolean payManaOptional(Card card, Cost cost, SpellAbility sa, String prompt, ManaPaymentPurpose purpose);

4
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -609,9 +609,9 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public void playChosenSpellAbility(SpellAbility sa) {
public boolean playChosenSpellAbility(SpellAbility sa) {
// TODO Play abilities from here
return true;
}
@Override

4
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1359,8 +1359,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
}
@Override
public void playChosenSpellAbility(final SpellAbility chosenSa) {
HumanPlay.playSpellAbility(this, player, chosenSa);
public boolean playChosenSpellAbility(final SpellAbility chosenSa) {
return HumanPlay.playSpellAbility(this, player, chosenSa);
}
@Override