Improve flashback check

Author: radar

lib/magic/actions/cast.rb

@@ -43,7 +43,7 @@ def mana_cost=(cost)
 
       def mana_cost
         @mana_cost ||= begin
-          if @flashback
+          if @flashback && card.zone.graveyard?
             cost = card.flashback_cost
           else
             cost = card.cost

spec/stack/counterspell_spec.rb

@@ -9,6 +9,11 @@
 
   context "counters annul, which was countering sol ring" do
     it "sol ring enters the battlefield" do
+      p1.hand.add(sol_ring)
+      p1.hand.add(counterspell)
+
+      p2.hand.add(annul)
+
       p1.add_mana(red: 1)
       sol_ring_action = cast_action(card: sol_ring, player: p1)
       sol_ring_action.pay_mana(generic: { red: 1 } )