Merge branch 'unblink' into 'master'

MID: Unblinking Observer and support

See merge request core-developers/forge!5407

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

@@ -308,9 +308,8 @@ public class AbilityManaPart implements java.io.Serializable {
             if (restriction.equals("CumulativeUpkeep")) {
                 if (sa.isCumulativeupkeep()) {
                     return true;
-                } else {
-                    continue;
                 }
+                continue;
             }
 
             if (restriction.startsWith("CostContainsX")) {
@@ -319,13 +318,20 @@ public class AbilityManaPart implements java.io.Serializable {
                 }
                 continue;
             }
+
+            if (restriction.equals("Disturb")) {
+                if (sa.isDisturb()) {
+                    return true;
+                }
+                continue;
+            }
+
             if (restriction.equals("MorphOrManifest")) {
                 if ((sa.isSpell() && sa.getHostCard().isCreature() && sa.isCastFaceDown())
                         || sa.isManifestUp() || sa.isMorphUp()) {
                     return true;
-                } else {
-                    continue;
                 }
+                continue;
             }
 
             if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) {

forge-gui/res/cardsfolder/upcoming/unblinking_observer.txt

@@ -0,0 +1,8 @@
+Name:Unblinking Observer
+ManaCost:1 U
+Types:Creature Homunculus
+PT:2/1
+A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Disturb,Instant,Sorcery | SpellDescription$ Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.
+DeckNeeds:Type$Instant|Sorcery
+DeckHints:Keyword$Disturb
+Oracle:{T}: Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.