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 missing checks (#5601)

Browse Source
This commit is contained in:
tool4ever
2024-07-14 07:59:36 +00:00
committed by GitHub
parent 96ee06bd81
commit 8fe5bb2086
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java
View File

@@ -96,7 +96,7 @@ public class PhasesEffect extends SpellAbilityEffect {
} }
} else { // just phase out } else { // just phase out
for (final Card tgtC : tgtCards) { for (final Card tgtC : tgtCards) {
if (!tgtC.isPhasedOut()) { if (!tgtC.isPhasedOut() && !StaticAbilityCantPhase.cantPhaseOut(tgtC)) {
tgtC.phase(false); tgtC.phase(false);
if (tgtC.isPhasedOut()) { if (tgtC.isPhasedOut()) {
if (sa.hasParam("RememberAffected")) { if (sa.hasParam("RememberAffected")) {

3
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -5570,6 +5570,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
// CR 702.26g // CR 702.26g
if (!getAllAttachedCards().isEmpty()) { if (!getAllAttachedCards().isEmpty()) {
for (final Card eq : getAllAttachedCards()) { for (final Card eq : getAllAttachedCards()) {
if (!eq.isPhasedOut() && StaticAbilityCantPhase.cantPhaseOut(eq)) {
continue;
}
if (eq.isPhasedOut() == phasingIn) { if (eq.isPhasedOut() == phasingIn) {
eq.phase(fromUntapStep, false); eq.phase(fromUntapStep, false);
} }