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

Merge branch 'fixLivio' into 'master'

Browse Source 
Livio, Oathsworn Sentinel: fix first ability by adding Chooser to known origin

See merge request core-developers/forge!3886
This commit is contained in:
Michael Kamensky
2021-02-18 09:41:09 +00:00
parent a019d6ca5b 3fdb0c6d44
commit df61b15f8e
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -485,6 +485,16 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final long ts = game.getNextTimestamp();
boolean combatChanged = false;
Player chooser = player;
if (sa.hasParam("Chooser")) {
final String choose = sa.getParam("Chooser");
if (choose.equals("Targeted") && sa.getTargets().isTargetingAnyPlayer()) {
chooser = sa.getTargets().getFirstTargetedPlayer();
} else {
chooser = AbilityUtils.getDefinedPlayers(sa.getHostCard(), choose, sa).get(0);
}
}
for (final Card tgtC : tgtCards) {
final Card gameCard = game.getCardState(tgtC, null);
// gameCard is LKI in that case, the card is not in game anymore
@@ -501,7 +511,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
}
final String prompt = TextUtil.concatWithSpace(Localizer.getInstance().getMessage("lblDoYouWantMoveTargetFromOriToDest", CardTranslation.getTranslatedName(gameCard.getName()), Lang.joinHomogenous(origin, ZoneType.Accessors.GET_TRANSLATED_NAME), destination.getTranslatedName()));
if (optional && !player.getController().confirmAction(sa, null, prompt) )
if (optional && !chooser.getController().confirmAction(sa, null, prompt) )
continue;
final Zone originZone = game.getZoneOf(gameCard);