- Better check for Sunburst.

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -1401,10 +1401,12 @@ public class CardFactoryUtil {
             return doXMath(n, m, c);
         }
         if (sq[0].startsWith("UniqueManaColorsProduced")) {
+            boolean untappedOnly = sq[0].contains("ByUntappedSources");
             int uniqueColors = 0;
             CardCollectionView otb = cc.getCardsIn(ZoneType.Battlefield);
             outer: for (byte color : MagicColor.WUBRG) {
                 for (Card card : otb) {
+                    if (!card.isTapped() || !untappedOnly) {
                         for (SpellAbility ma : card.getManaAbilities()) {
                             if (ma.getManaPart().canProduce(MagicColor.toShortString(color))) {
                                 uniqueColors++;
@@ -1413,6 +1415,7 @@ public class CardFactoryUtil {
                         }
                     }
                 }
+            }
             return doXMath(uniqueColors, m, c);
         }
         // Count$Converge

forge-gui/res/cardsfolder/c/clearwater_goblet.txt

@@ -6,6 +6,6 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | O
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:Count$CardCounters.CHARGE
 SVar:NeedsToPlayVar:Z GE2
-SVar:Z:Count$UniqueManaColorsProduced
+SVar:Z:Count$UniqueManaColorsProduced.ByUntappedSources
 SVar:Picture:http://www.wizards.com/global/images/magic/general/clearwater_goblet.jpg
 Oracle:Sunburst (This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)\nAt the beginning of your upkeep, you may gain life equal to the number of charge counters on Clearwater Goblet.