From e418ab04be33d494a1483647ae9d390dcbc0f1be Mon Sep 17 00:00:00 2001
From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com>
Date: Tue, 7 Jun 2022 01:58:39 +0100
Subject: [PATCH] Removed duplicate minotaur token class. Closes #8947

---
 .../src/main/resources/card-pictures-tok.txt  |  2 +-
 Mage.Sets/src/mage/cards/f/FlurryOfHorns.java |  4 +--
 .../token/FlurryOfHornsMinotaurToken.java     | 34 -------------------
 .../game/permanent/token/MinotaurToken.java   | 14 ++++++++
 4 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java

diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 34a0134511..bcd408a945 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -693,7 +693,7 @@
 |Generate|TOK:ISD|Zombie|2||ZombieToken|
 |Generate|TOK:ISD|Zombie|3||ZombieToken|
 |Generate|TOK:JOU|Hydra|||HydraBroodmasterToken|
-|Generate|TOK:JOU|Minotaur|||FlurryOfHornsMinotaurToken|
+|Generate|TOK:JOU|Minotaur|||MinotaurToken|
 |Generate|TOK:JOU|Snake|||PharikaSnakeToken|
 |Generate|TOK:JOU|Sphinx|||HourOfNeedSphinxToken|
 |Generate|TOK:JOU|Spider|||RenownedWeaverSpiderToken|
diff --git a/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java b/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java
index 17ef866b96..26369b4776 100644
--- a/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java
+++ b/Mage.Sets/src/mage/cards/f/FlurryOfHorns.java
@@ -6,7 +6,7 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.game.permanent.token.FlurryOfHornsMinotaurToken;
+import mage.game.permanent.token.MinotaurToken;
 
 /**
  *
@@ -18,7 +18,7 @@ public final class FlurryOfHorns extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}");
 
         // Create two 2/3 red Minotaur creature tokens with haste.
-        this.getSpellAbility().addEffect(new CreateTokenEffect(new FlurryOfHornsMinotaurToken(), 2));
+        this.getSpellAbility().addEffect(new CreateTokenEffect(new MinotaurToken(true), 2));
     }
 
     private FlurryOfHorns(final FlurryOfHorns card) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java
deleted file mode 100644
index 2f4b10bbdc..0000000000
--- a/Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-package mage.game.permanent.token;
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.MageInt;
-import mage.ObjectColor;
-import mage.abilities.keyword.HasteAbility;
-
-/**
- *
- * @author spjspj
- */
-public final class FlurryOfHornsMinotaurToken extends TokenImpl {
-
-    public FlurryOfHornsMinotaurToken() {
-        super("Minotaur Token", "2/3 red Minotaur creature tokens with haste");
-        this.setOriginalExpansionSetCode("JOU");
-        cardType.add(CardType.CREATURE);
-        color.setColor(ObjectColor.RED);
-        subtype.add(SubType.MINOTAUR);
-        power = new MageInt(2);
-        toughness = new MageInt(3);
-        addAbility(HasteAbility.getInstance());
-    }
-
-    public FlurryOfHornsMinotaurToken(final FlurryOfHornsMinotaurToken token) {
-        super(token);
-    }
-
-    public FlurryOfHornsMinotaurToken copy() {
-        return new FlurryOfHornsMinotaurToken(this);
-    }
-}
diff --git a/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java b/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java
index 698338e175..653142a5a2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java
@@ -2,14 +2,26 @@ package mage.game.permanent.token;
 
 import mage.MageInt;
 import mage.ObjectColor;
+import mage.abilities.keyword.HasteAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
  * @author TheElk801
  */
 public final class MinotaurToken extends TokenImpl {
 
+    public MinotaurToken(boolean withHaste) {
+        this();
+
+        if (withHaste) {
+            addAbility(HasteAbility.getInstance());
+            this.description = "2/3 red Minotaur creature tokens with haste";
+        }
+    }
+
     public MinotaurToken() {
         super("Minotaur Token", "2/3 red Minotaur creature token");
         cardType.add(CardType.CREATURE);
@@ -17,6 +29,8 @@ public final class MinotaurToken extends TokenImpl {
         subtype.add(SubType.MINOTAUR);
         power = new MageInt(2);
         toughness = new MageInt(3);
+
+        availableImageSetCodes = Arrays.asList("JOU");
     }
 
     private MinotaurToken(final MinotaurToken token) {