Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Change Duration.UntilTheNextEndStep to statically end during the beginning of EndStep.

Browse source
This commit is contained in:
Grath 2024-09-30 22:08:58 -04:00
parent b1678036fa
commit 49bce836f9
6 changed files with 61 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
View file

@ -120,8 +120,8 @@ public class ContinuousEffects implements Serializable {
preventionEffects.removeEndOfCombatEffects();
requirementEffects.removeEndOfCombatEffects();
restrictionEffects.removeEndOfCombatEffects();
for (ContinuousEffectsList asThoughtlist : asThoughEffectsMap.values()) {
asThoughtlist.removeEndOfCombatEffects();
for (ContinuousEffectsList asThoughlist : asThoughEffectsMap.values()) {
asThoughlist.removeEndOfCombatEffects();
}
costModificationEffects.removeEndOfCombatEffects();
spliceCardEffects.removeEndOfCombatEffects();
@ -134,13 +134,27 @@ public class ContinuousEffects implements Serializable {
preventionEffects.removeEndOfTurnEffects(game);
requirementEffects.removeEndOfTurnEffects(game);
restrictionEffects.removeEndOfTurnEffects(game);
for (ContinuousEffectsList asThoughtlist : asThoughEffectsMap.values()) {
asThoughtlist.removeEndOfTurnEffects(game);
for (ContinuousEffectsList asThoughlist : asThoughEffectsMap.values()) {
asThoughlist.removeEndOfTurnEffects(game);
}
costModificationEffects.removeEndOfTurnEffects(game);
spliceCardEffects.removeEndOfTurnEffects(game);
}
public synchronized void removeBeginningOfEndStepEffects(Game game) {
layeredEffects.removeBeginningOfEndStepEffects(game);
continuousRuleModifyingEffects.removeBeginningOfEndStepEffects(game);
replacementEffects.removeBeginningOfEndStepEffects(game);
preventionEffects.removeBeginningOfEndStepEffects(game);
requirementEffects.removeBeginningOfEndStepEffects(game);
restrictionEffects.removeBeginningOfEndStepEffects(game);
for (ContinuousEffectsList asThoughlist : asThoughEffectsMap.values()) {
asThoughlist.removeBeginningOfEndStepEffects(game);
}
costModificationEffects.removeBeginningOfEndStepEffects(game);
spliceCardEffects.removeBeginningOfEndStepEffects(game);
}
public synchronized void removeInactiveEffects(Game game) {
layeredEffects.removeInactiveEffects(game);
continuousRuleModifyingEffects.removeInactiveEffects(game);