github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4764 from spjspj/master

Browse source 
Minor revert.
This commit is contained in:
spjspj 2018-04-15 21:49:19 +10:00 committed by GitHub
commit 33be5db065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -36,6 +36,7 @@ import mage.MageObject;
import mage.abilities.*; import mage.abilities.*;
import mage.abilities.common.AttachableToRestrictedAbility; import mage.abilities.common.AttachableToRestrictedAbility;
import mage.abilities.common.CantHaveMoreThanAmountCountersSourceAbility; import mage.abilities.common.CantHaveMoreThanAmountCountersSourceAbility;
import mage.abilities.common.SagaAbility;
import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.ContinuousEffects; import mage.abilities.effects.ContinuousEffects;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
@ -1923,7 +1924,7 @@ public abstract class GameImpl implements Game, Serializable {
if (perm.isWorld()) { if (perm.isWorld()) {
worldEnchantment.add(perm); worldEnchantment.add(perm);
} }
if (StaticFilters.FILTER_PERMANENT_AURA.match(perm, this)) { if (perm.hasSubtype(SubType.AURA, this)) {
//20091005 - 704.5n, 702.14c //20091005 - 704.5n, 702.14c
if (perm.getAttachedTo() == null) { if (perm.getAttachedTo() == null) {
Card card = this.getCard(perm.getId()); Card card = this.getCard(perm.getId());
@ -2013,6 +2014,30 @@ public abstract class GameImpl implements Game, Serializable {
} }
} }
} }
// Remove Saga enchantment if last chapter is reached and chapter ability has left the stack
if (perm.hasSubtype(SubType.SAGA, this)) {
for (Ability sagaAbility : perm.getAbilities()) {
if (sagaAbility instanceof SagaAbility) {
int maxChapter = ((SagaAbility) sagaAbility).getMaxChapter().getNumber();
if (maxChapter <= perm.getCounters(this).getCount(CounterType.LORE)) {
boolean noChapterAbilityOnStack = true;
// Check chapter abilities on stack
for (StackObject stackObject : getStack()) {
if (stackObject.getSourceId().equals(perm.getId()) && SagaAbility.isChapterAbility(stackObject)) {
noChapterAbilityOnStack = false;
break;
}
}
if (noChapterAbilityOnStack) {
// After the last chapter ability has left the stack, you'll sacrifice the Saga
perm.sacrifice(perm.getId(), this);
somethingHappened = true;
}
}
}
}
}
if (this.getState().isLegendaryRuleActive() && StaticFilters.FILTER_PERMANENT_LEGENDARY.match(perm, this)) { if (this.getState().isLegendaryRuleActive() && StaticFilters.FILTER_PERMANENT_LEGENDARY.match(perm, this)) {
legendary.add(perm); legendary.add(perm);
} }