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

Merge pull request #2297 from tool4ever/sbafix

Browse Source 
Increase SBA check precision
This commit is contained in:
Anthony Calosa
2023-01-22 21:59:30 +08:00
committed by GitHub
parent 8a6b06d872 fd604e3ce6
commit c42f1b8149
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1641,6 +1641,12 @@ public class GameAction {
boolean checkAgain = false; boolean checkAgain = false;
if (c.isRealToken()) { if (c.isRealToken()) {
final Zone zoneFrom = game.getZoneOf(c); final Zone zoneFrom = game.getZoneOf(c);
// card copies are allowed on the stack
if (zoneFrom.is(ZoneType.Stack) && c.getCopiedPermanent() != null) {
return false;
}
if (!zoneFrom.is(ZoneType.Battlefield)) { if (!zoneFrom.is(ZoneType.Battlefield)) {
zoneFrom.remove(c); zoneFrom.remove(c);
checkAgain = true; checkAgain = true;

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

@@ -160,7 +160,6 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
copies.add(copy); copies.add(copy);
} }
} }
} }
} else { } else {
for (int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {
@@ -238,7 +237,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
card.addRemembered(copies); card.addRemembered(copies);
} }
} }
} // end resolve }
private void resetFirstTargetOnCopy(SpellAbility copy, GameEntity obj, SpellAbility targetedSA) { private void resetFirstTargetOnCopy(SpellAbility copy, GameEntity obj, SpellAbility targetedSA) {
copy.resetFirstTarget(obj, targetedSA); copy.resetFirstTarget(obj, targetedSA);