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

TargetSelection: Fix stack peeking detection

Browse Source
This commit is contained in:
Bug Hunter
2021-03-29 08:00:21 +00:00
committed by Michael Kamensky
parent 9802cb62d9
commit 28dbb309cf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui/src/main/java/forge/player/TargetSelection.java
View File

@@ -266,11 +266,11 @@ public class TargetSelection {
} }
if (((CardView) chosen).getZone().equals(ZoneType.Stack)) { if (((CardView) chosen).getZone().equals(ZoneType.Stack)) {
for (final SpellAbilityStackInstance si : game.getStack()) { for (final SpellAbilityStackInstance si : game.getStack()) {
// avoid peeking own SI so target is not changed
if (si.compareToSpellAbility(ability)) {
continue;
}
SpellAbility abilityOnStack = si.getSpellAbility(true); SpellAbility abilityOnStack = si.getSpellAbility(true);
if (si.compareToSpellAbility(ability)) {
// By peeking at stack item, target is set to its SI state. So set it back before adding targets
ability.resetTargets();
}
if (abilityOnStack.getHostCard().getView().equals(chosen)) { if (abilityOnStack.getHostCard().getView().equals(chosen)) {
ability.getTargets().add(abilityOnStack); ability.getTargets().add(abilityOnStack);
break; break;
@@ -293,11 +293,11 @@ public class TargetSelection {
final Game game = ability.getActivatingPlayer().getGame(); final Game game = ability.getActivatingPlayer().getGame();
for (final SpellAbilityStackInstance si : game.getStack()) { for (final SpellAbilityStackInstance si : game.getStack()) {
// avoid peeking own SI so target is not changed
if (si.compareToSpellAbility(ability)) {
continue;
}
SpellAbility abilityOnStack = si.getSpellAbility(true); SpellAbility abilityOnStack = si.getSpellAbility(true);
if (si.compareToSpellAbility(ability)) {
// By peeking at stack item, target is set to its SI state. So set it back before adding targets
ability.resetTargets();
}
if (ability.canTargetSpellAbility(abilityOnStack)) { if (ability.canTargetSpellAbility(abilityOnStack)) {
stackItemViewCache.put(si.getView(), si); stackItemViewCache.put(si.getView(), si);
selectOptions.add(si.getView()); selectOptions.add(si.getView());