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

Merge branch 'fireball' into 'master'

Browse Source 
Fix Fireball

Closes #1970

See merge request core-developers/forge!5333
This commit is contained in:
Michael Kamensky
2021-09-12 10:06:38 +00:00
parent 2e437dcbae df4c64070d
commit 3d830f532e
12 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java
View File

@@ -87,7 +87,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
try {
final boolean isUiToStop = !humanController.getGui().isUiSetToSkipPhase(ev.playerTurn.getView(), ev.phase);
switch(ev.phase) {
switch (ev.phase) {
case COMBAT_END:
case COMBAT_DECLARE_ATTACKERS:
case COMBAT_DECLARE_BLOCKERS:

3
forge-gui/src/main/java/forge/player/HumanCostDecision.java
View File

@@ -720,8 +720,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
final CardView view = CardView.get(card);
return player.getController().confirmPayment(cost, Localizer.getInstance().getMessage("lblReturnCardToHandConfirm", CardTranslation.getTranslatedName(view.getName())), ability) ? PaymentDecision.card(card) : null;
}
}
else {
} else {
final CardCollectionView validCards = CardLists.getValidCards(ability.getActivatingPlayer().getCardsIn(ZoneType.Battlefield),
cost.getType().split(";"), player, source, ability);