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

Merge pull request #283 from tool4ever/caststuff

Browse Source 
Fix casting card copies not being added to stack correctly
This commit is contained in:
Anthony Calosa
2022-05-08 05:53:50 +08:00
committed by GitHub
parent 864d2caa12 9db791d875
commit c039f238d0
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -275,7 +275,12 @@ public class GameAction {
lastKnownInfo = CardUtil.getLKICopy(c);
}
copied = CardFactory.copyCard(c, false);
// CR 707.12 casting of a card copy, don't copy it again
if (zoneTo.is(ZoneType.Stack) && c.isRealToken()) {
copied = c;
} else {
copied = CardFactory.copyCard(c, false);
}
if (zoneTo.is(ZoneType.Stack)) {
// when moving to stack, copy changed card information

2
forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
View File

@@ -34,7 +34,7 @@ public class AbandonEffect extends SpellAbilityEffect {
if (sa.hasParam("RememberAbandoned")) {
source.addRemembered(source);
}
game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
controller.getZone(ZoneType.Command).remove(source);
game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);

6
forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
View File

@@ -35,13 +35,13 @@ public class BalanceEffect extends SpellAbilityEffect {
Game game = activator.getGame();
String valid = sa.getParamOrDefault("Valid", "Card");
ZoneType zone = sa.hasParam("Zone") ? ZoneType.smartValueOf(sa.getParam("Zone")) : ZoneType.Battlefield;
int min = Integer.MAX_VALUE;
final FCollectionView<Player> players = game.getPlayersInTurnOrder();
final List<CardCollection> validCards = new ArrayList<>(players.size());
Map<Player, CardCollectionView> discardedMap = Maps.newHashMap();
for (int i = 0; i < players.size(); i++) {
// Find the minimum of each Valid per player
validCards.add(CardLists.getValidCards(players.get(i).getCardsIn(zone), valid, activator, source, sa));

4
forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java
View File

@@ -33,7 +33,7 @@ public class BidLifeEffect extends SpellAbilityEffect {
} else {
startBidding = 0;
}
if (sa.hasParam("OtherBidder")) {
bidPlayers.add(activator);
bidPlayers.addAll(AbilityUtils.getDefinedPlayers(host, sa.getParam("OtherBidder"), sa));
@@ -62,7 +62,7 @@ public class BidLifeEffect extends SpellAbilityEffect {
}
}
}
host.setChosenNumber(bid);
host.addRemembered(winner);
final SpellAbility action = sa.getAdditionalAbility("BidSubAbility");