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

Merge branch 'kevlahnota-master-patch-24830' into 'master'

Browse Source 
Update ChangeTargetsEffect.java

See merge request core-developers/forge!4767
This commit is contained in:
Anthony Calosa
2021-05-27 08:55:13 +00:00
parent 92ac19fa2e c96aeb25e5
commit 94ec700c78
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
View File

@@ -100,7 +100,12 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
changingTgtSA.resetTargets();
List<GameEntity> candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true);
if (sa.hasParam("RandomTargetRestriction")) {
candidates.removeIf(c -> !c.isValid(sa.getParam("RandomTargetRestriction").split(","), sa.getActivatingPlayer(), sa.getHostCard(), sa));
candidates.removeIf(new java.util.function.Predicate<GameEntity>() {
@Override
public boolean test(GameEntity c) {
return !c.isValid(sa.getParam("RandomTargetRestriction").split(","), sa.getActivatingPlayer(), sa.getHostCard(), sa);
}
});
}
GameEntity choice = Aggregates.random(candidates);
changingTgtSA.getTargets().add(choice);