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

Fix ignoring CantAttach

Browse Source
This commit is contained in:
tool4EvEr
2023-02-13 18:18:47 +01:00
parent e48ac2e623
commit 938b4c50e1
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2524,17 +2524,12 @@ public class GameAction {
Player p = source.getController(); Player p = source.getController();
if (tgt.canTgtPlayer()) { if (tgt.canTgtPlayer()) {
final FCollection<Player> players = new FCollection<>(); final FCollection<Player> players = game.getPlayers().filter(PlayerPredicates.canBeAttached(source, aura));
for (Player player : game.getPlayers()) {
if (player.isValid(tgt.getValidTgts(), aura.getActivatingPlayer(), source, aura)) {
players.add(player);
}
}
final Player pa = p.getController().chooseSingleEntityForEffect(players, aura, final Player pa = p.getController().chooseSingleEntityForEffect(players, aura,
Localizer.getInstance().getMessage("lblSelectAPlayerAttachSourceTo", CardTranslation.getTranslatedName(source.getName())), null); Localizer.getInstance().getMessage("lblSelectAPlayerAttachSourceTo", CardTranslation.getTranslatedName(source.getName())), null);
if (pa != null) { if (pa != null) {
source.attachToEntity(pa, null); source.attachToEntity(pa, null, true);
return true; return true;
} }
} else { } else {
@@ -2553,7 +2548,7 @@ public class GameAction {
} }
list.addAll(game.getCardsIn(zones)); list.addAll(game.getCardsIn(zones));
list = CardLists.getValidCards(list, tgt.getValidTgts(), aura.getActivatingPlayer(), source, aura); list = CardLists.filter(list, CardPredicates.canBeAttached(source, aura));
if (list.isEmpty()) { if (list.isEmpty()) {
return false; return false;
} }