github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-03 17:00:16 -09:00
Code Issues Projects Releases Packages Wiki Activity

[SHM] Fix Conspire not working with modal spells

Browse source
This commit is contained in:
Alex W. Jackson 2022-10-28 22:02:24 -04:00
parent 33ac7d7da8
commit 129d900401
1 changed files with 2 additions and 2 deletions

4
Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java
View file

@ -131,7 +131,7 @@ public class ConspireAbility extends StaticAbility implements OptionalAdditional
+ conspireCost.getText(false) + " ?", ability, game)) { + conspireCost.getText(false) + " ?", ability, game)) {
return; return;
} }
ability.getEffects().setValue("ConspireActivation" + conspireId + addedById, true); ability.getAllEffects().setValue("ConspireActivation" + conspireId + addedById, true);
for (Iterator<Cost> it = ((Costs<Cost>) conspireCost).iterator(); it.hasNext(); ) { for (Iterator<Cost> it = ((Costs<Cost>) conspireCost).iterator(); it.hasNext(); ) {
Cost cost = (Cost) it.next(); Cost cost = (Cost) it.next();
if (cost instanceof ManaCostsImpl) { if (cost instanceof ManaCostsImpl) {
@ -193,7 +193,7 @@ class ConspireTriggeredAbility extends CastSourceTriggeredAbility {
return spell != null return spell != null
&& spell && spell
.getSpellAbility() .getSpellAbility()
.getEffects() .getAllEffects()
.stream() .stream()
.map(effect -> effect.getValue("ConspireActivation" + conspireId + addedById)) .map(effect -> effect.getValue("ConspireActivation" + conspireId + addedById))
.anyMatch(Objects::nonNull); .anyMatch(Objects::nonNull);