From d32bfea94e136e1617e41b659b2c3e3157ae3df6 Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 14 Nov 2013 13:25:28 +0000 Subject: [PATCH] - Fixed Braid of Fire --- forge-gui/res/cardsfolder/b/braid_of_fire.txt | 2 +- forge-gui/src/main/java/forge/card/mana/ManaPool.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/b/braid_of_fire.txt b/forge-gui/res/cardsfolder/b/braid_of_fire.txt index 690c9faf771..21ef0a2c2c4 100644 --- a/forge-gui/res/cardsfolder/b/braid_of_fire.txt +++ b/forge-gui/res/cardsfolder/b/braid_of_fire.txt @@ -1,7 +1,7 @@ Name:Braid of Fire ManaCost:1 R Types:Enchantment -K:Cumulative upkeep:AddMana<1/R>:Add R to your mana pool. +K:Cumulative upkeep:AddMana<1/R>:Add {R} to your mana pool. SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/braid_of_fire.jpg Oracle:Cumulative upkeep-Add {R} to your mana pool. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) \ No newline at end of file diff --git a/forge-gui/src/main/java/forge/card/mana/ManaPool.java b/forge-gui/src/main/java/forge/card/mana/ManaPool.java index e82fff42447..d1e2ee4916a 100644 --- a/forge-gui/src/main/java/forge/card/mana/ManaPool.java +++ b/forge-gui/src/main/java/forge/card/mana/ManaPool.java @@ -206,7 +206,7 @@ public class ManaPool { continue; for(final Mana thisMana : this.floatingMana.get(manaKey)) { - if (!thisMana.getManaAbility().meetsManaRestrictions(saBeingPaidFor)) { + if (thisMana.getManaAbility() != null && !thisMana.getManaAbility().meetsManaRestrictions(saBeingPaidFor)) { continue; }