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 remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view

Browse Source
This commit is contained in:
leriomaggio
2021-05-31 19:25:20 +01:00
parent 8a1770ffda 9b69d79a78
commit 1ac28b5203
41 changed files with 105 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java
View File

@@ -84,7 +84,6 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
if (sa.hasParam("Choices")) {
permanentSources = CardLists.getValidCards(permanentSources, sa.getParam("Choices"), host.getController(), host, sa);
stackSources = CardLists.getValidCards(stackSources, sa.getParam("Choices"), host.getController(), host, sa);
referencedSources = CardLists.getValidCards(referencedSources, sa.getParam("Choices"), host.getController(), host, sa);
commandZoneSources = CardLists.getValidCards(commandZoneSources, sa.getParam("Choices"), host.getController(), host, sa);
@@ -137,7 +136,7 @@ public class ChooseSourceEffect extends SpellAbilityEffect {
Card o = null;
do {
o = p.getController().chooseSingleEntityForEffect(sourcesToChooseFrom, sa, choiceTitle, null);
} while (o == null);
} while (o == null || o.getName().startsWith("--"));
chosen.add(o);
sourcesToChooseFrom.remove(o);
}

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

@@ -24,7 +24,7 @@ public class ControlGainEffect extends SpellAbilityEffect {
protected String getStackDescription(SpellAbility sa) {
final StringBuilder sb = new StringBuilder();
final List<Player> newController = getTargetPlayers(sa, "NewController");
final List<Player> newController = getDefinedPlayersOrTargeted(sa, "NewController");
if (newController.isEmpty()) {
newController.add(sa.getActivatingPlayer());
}