diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java index 0f9d53264aa..ba601ad6c28 100644 --- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java +++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java @@ -472,19 +472,19 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn //************** Link to different CardFactories ******************* Card card2 = null; if (card.isCreature()) { - card2 = CardFactory_Creatures.getCard(card, cardName, owner, this); + card2 = CardFactory_Creatures.getCard(card, cardName, this); } else if (card.isAura()) { - card2 = CardFactory_Auras.getCard(card, cardName, owner); + card2 = CardFactory_Auras.getCard(card, cardName); } else if (card.isEquipment()) { - card2 = CardFactory_Equipment.getCard(card, cardName, owner); + card2 = CardFactory_Equipment.getCard(card, cardName); } else if (card.isPlaneswalker()) { - card2 = CardFactory_Planeswalkers.getCard(card, cardName, owner); + card2 = CardFactory_Planeswalkers.getCard(card, cardName); } else if (card.isLand()) { - card2 = CardFactory_Lands.getCard(card, cardName, owner, this); + card2 = CardFactory_Lands.getCard(card, cardName, this); } else if (card.isInstant()) { - card2 = CardFactory_Instants.getCard(card, cardName, owner); + card2 = CardFactory_Instants.getCard(card, cardName); } else if (card.isSorcery()) { - card2 = CardFactory_Sorceries.getCard(card, cardName, owner); + card2 = CardFactory_Sorceries.getCard(card, cardName); } if (card2 != null) { diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Auras.java b/src/main/java/forge/card/cardFactory/CardFactory_Auras.java index 67d44dd274e..ba107524d3a 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Auras.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Auras.java @@ -58,7 +58,7 @@ class CardFactory_Auras { * @param owner a {@link forge.Player} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, final String cardName, final Player owner) { + public static Card getCard(final Card card, final String cardName) { //*************** START *********** START ************************** if (cardName.equals("Convincing Mirage") || cardName.equals("Phantasmal Terrain") diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java index cd069363380..be2b44d9830 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java @@ -111,7 +111,7 @@ public class CardFactory_Creatures { * @param cf a {@link forge.card.cardFactory.CardFactoryInterface} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, final String cardName, Player owner, CardFactoryInterface cf) { + public static Card getCard(final Card card, final String cardName, CardFactoryInterface cf) { //*************** START *********** START ************************** if (cardName.equals("Force of Savagery")) { diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Equipment.java b/src/main/java/forge/card/cardFactory/CardFactory_Equipment.java index f8ec2fd0b40..f3f66be397d 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Equipment.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Equipment.java @@ -46,7 +46,7 @@ class CardFactory_Equipment { * @param owner a {@link forge.Player} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, String cardName, Player owner) { + public static Card getCard(final Card card, String cardName) { //*************** START *********** START ************************** if (cardName.equals("Umbral Mantle")) { diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java b/src/main/java/forge/card/cardFactory/CardFactory_Instants.java index a080c113ddd..9564945e1ad 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Instants.java @@ -42,7 +42,7 @@ public class CardFactory_Instants { * @param owner a {@link forge.Player} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, final String cardName, final Player owner) { + public static Card getCard(final Card card, final String cardName) { //*************** START *********** START ************************** diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Lands.java b/src/main/java/forge/card/cardFactory/CardFactory_Lands.java index a17b15f9884..c9d57574c05 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Lands.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Lands.java @@ -25,7 +25,7 @@ class CardFactory_Lands { * @param cf a {@link forge.card.cardFactory.CardFactoryInterface} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, final String cardName, Player owner, CardFactoryInterface cf) { + public static Card getCard(final Card card, final String cardName, CardFactoryInterface cf) { //*************** START *********** START ************************** diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java b/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java index 12821dfdcfe..8aa9c9ff6dc 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java @@ -26,7 +26,7 @@ public class CardFactory_Planeswalkers { * @param owner a {@link forge.Player} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, String cardName, Player owner) { + public static Card getCard(final Card card, String cardName) { // All Planeswalkers set their loyality in the beginning if (card.getBaseLoyalty() > 0) card.addComesIntoPlayCommand(CardFactoryUtil.entersBattleFieldWithCounters(card, Counters.LOYALTY, card.getBaseLoyalty())); diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java index ede4656aa6c..f5fab8d7550 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java @@ -31,7 +31,7 @@ public class CardFactory_Sorceries { * @param owner a {@link forge.Player} object. * @return a {@link forge.Card} object. */ - public static Card getCard(final Card card, final String cardName, Player owner) { + public static Card getCard(final Card card, final String cardName) { //*************** START *********** START ************************** if (cardName.equals("Political Trickery")) {