From a7acaefb4afb4fc4e373388f4424f9fbccd1956a Mon Sep 17 00:00:00 2001
From: Jeff <jeff@delmarus.com>
Date: Mon, 11 Feb 2019 17:04:22 -0600
Subject: [PATCH] - Fixed text Goblin Flotilla.

---
 .../src/mage/cards/g/GoblinFlotilla.java      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java b/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java
index caaa53ed511..2abda792419 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinFlotilla.java
@@ -1,4 +1,3 @@
-
 package mage.cards.g;
 
 import java.util.UUID;
@@ -6,6 +5,7 @@ import mage.MageInt;
 import mage.abilities.common.BeginningOfCombatTriggeredAbility;
 import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility;
 import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.DoUnlessControllerPaysEffect;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
@@ -27,22 +27,32 @@ public final class GoblinFlotilla extends CardImpl {
     public GoblinFlotilla(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
         this.subtype.add(SubType.GOBLIN);
-        
+
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
         // Islandwalk
         this.addAbility(new IslandwalkAbility());
+
         // At the beginning of each combat, unless you pay {R}, whenever Goblin Flotilla blocks or becomes blocked by a creature this combat, that creature gains first strike until end of turn.
+        Effect effect = new DoUnlessControllerPaysEffect(
+                new GainAbilitySourceEffect(
+                        new BlocksOrBecomesBlockedTriggeredAbility(
+                                new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(),
+                                        Duration.EndOfTurn,
+                                        "Blocks or Blocked by Goblin Flotilla"),
+                                false),
+                        Duration.EndOfCombat),
+                new ManaCostsImpl("{R}"),
+                "Pay Goblin Flotilla combat effect?"
+        );
+        effect.setText("unless you pay {R}, whenever {this} blocks or becomes blocked by a creature this combat, that creature gains first strike until end of turn.");
         this.addAbility(new BeginningOfCombatTriggeredAbility(
-                new DoUnlessControllerPaysEffect(
-                        new GainAbilitySourceEffect(new BlocksOrBecomesBlockedTriggeredAbility(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, "Blocks or Blocked by Goblin Flotilla"), false), Duration.EndOfCombat),
-                        new ManaCostsImpl("{R}"),
-                        "Pay Goblin Flotilla combat effect?"
-                ),
+                effect,
                 TargetController.ANY,
                 false
         ));
+
     }
 
     public GoblinFlotilla(final GoblinFlotilla card) {