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

Fix Chef's Kiss

Browse Source
This commit is contained in:
tool4EvEr
2023-01-23 19:43:57 +01:00
parent 209da64728
commit e37a71273e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,6 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
changingTgtSI = changingTgtSI.getSubInstance(); changingTgtSI = changingTgtSI.getSubInstance();
} }
if (allTargets.isEmpty()) { if (allTargets.isEmpty()) {
// is it an error or not?
System.err.println("Player managed to target a spell without targets with Spellskite's ability.");
return; return;
} }
@@ -98,7 +96,6 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
// random target and DefinedMagnet works on single targets // random target and DefinedMagnet works on single targets
if (sa.hasParam("RandomTarget")) { if (sa.hasParam("RandomTarget")) {
int div = changingTgtSA.getTotalDividedValue(); int div = changingTgtSA.getTotalDividedValue();
changingTgtSA.resetTargets();
List<GameEntity> candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true); List<GameEntity> candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true);
if (sa.hasParam("RandomTargetRestriction")) { if (sa.hasParam("RandomTargetRestriction")) {
candidates.removeIf(new java.util.function.Predicate<GameEntity>() { candidates.removeIf(new java.util.function.Predicate<GameEntity>() {
@@ -108,6 +105,11 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
} }
}); });
} }
// CR 115.7a If a target can't be changed to another legal target, the original target is unchanged
if (candidates.isEmpty()) {
return;
}
changingTgtSA.resetTargets();
GameEntity choice = Aggregates.random(candidates); GameEntity choice = Aggregates.random(candidates);
changingTgtSA.getTargets().add(choice); changingTgtSA.getTargets().add(choice);
if (changingTgtSA.isDividedAsYouChoose()) { if (changingTgtSA.isDividedAsYouChoose()) {

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

@@ -180,8 +180,10 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
} }
}); });
} }
GameEntity choice = Aggregates.random(candidates); if (!candidates.isEmpty()) {
resetFirstTargetOnCopy(copy, choice, chosenSA); GameEntity choice = Aggregates.random(candidates);
resetFirstTargetOnCopy(copy, choice, chosenSA);
}
} }
// extra case for Epic to remove the keyword and the last part of the SpellAbility // extra case for Epic to remove the keyword and the last part of the SpellAbility