Merge branch 'hasManaAbility' into 'master'

Fix hasManaAbility

See merge request core-developers/forge!5552

forge-game/src/main/java/forge/game/ForgeScript.java

@@ -1,5 +1,7 @@
 package forge.game;
 
+import com.google.common.collect.Iterables;
+
 import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.card.mana.ManaAtom;
@@ -11,7 +13,9 @@ import forge.game.cost.Cost;
 import forge.game.mana.ManaCostBeingPaid;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
+import forge.game.spellability.SpellAbilityPredicates;
 import forge.game.staticability.StaticAbility;
+import forge.game.trigger.Trigger;
 import forge.game.zone.ZoneType;
 import forge.util.Expressions;
 
@@ -102,8 +106,11 @@ public class ForgeScript {
             }
             return false;
         } else if (property.equals("hasManaAbility")) {
-            for (final SpellAbility sa : cardState.getSpellAbilities()) {
+            if (Iterables.any(cardState.getSpellAbilities(), SpellAbilityPredicates.isManaAbility())) {
-                if (sa.isManaAbility()) {
+                return true;
+            }
+            for (final Trigger trig : cardState.getTriggers()) {
+                if (trig.getOverridingAbility() != null && trig.getOverridingAbility().isManaAbility()) {
                     return true;
                 }
             }

forge-game/src/main/java/forge/game/spellability/SpellAbility.java

@@ -364,7 +364,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
         if (isPwAbility()) {
             return false; //Loyalty ability, not a mana ability.
         }
-        if (isWrapper() && this.getTrigger().getMode() != TriggerType.TapsForMana) {
+        // CR 605.1b
+        if (isTrigger() && this.getTrigger().getMode() != TriggerType.TapsForMana) {
             return false;
         }