github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5487 from ninthworld/Omnath

Browse source 
Fix ManaTypeInManaPoolCount to include conditional mana (Fixes #5458)
This commit is contained in:
LevelX2 2019-01-03 17:38:34 +01:00 committed by GitHub
commit 423115ced5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/dynamicvalue/common/ManaTypeInManaPoolCount.java
View file

@ -1,5 +1,6 @@
package mage.abilities.dynamicvalue.common;
import mage.ConditionalMana;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
@ -29,6 +30,9 @@ public class ManaTypeInManaPoolCount implements DynamicValue {
Player player = game.getPlayer(sourceAbility.getControllerId());
if (player != null) {
amount = player.getManaPool().get(manaType);
for (ConditionalMana mana : player.getManaPool().getConditionalMana()) {
amount += mana.get(manaType);
}
}
return amount;
}