mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
removed a useless "owner" parameter from getCard method of all factories
This commit is contained in:
@@ -472,19 +472,19 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
|
|||||||
//************** Link to different CardFactories *******************
|
//************** Link to different CardFactories *******************
|
||||||
Card card2 = null;
|
Card card2 = null;
|
||||||
if (card.isCreature()) {
|
if (card.isCreature()) {
|
||||||
card2 = CardFactory_Creatures.getCard(card, cardName, owner, this);
|
card2 = CardFactory_Creatures.getCard(card, cardName, this);
|
||||||
} else if (card.isAura()) {
|
} else if (card.isAura()) {
|
||||||
card2 = CardFactory_Auras.getCard(card, cardName, owner);
|
card2 = CardFactory_Auras.getCard(card, cardName);
|
||||||
} else if (card.isEquipment()) {
|
} else if (card.isEquipment()) {
|
||||||
card2 = CardFactory_Equipment.getCard(card, cardName, owner);
|
card2 = CardFactory_Equipment.getCard(card, cardName);
|
||||||
} else if (card.isPlaneswalker()) {
|
} else if (card.isPlaneswalker()) {
|
||||||
card2 = CardFactory_Planeswalkers.getCard(card, cardName, owner);
|
card2 = CardFactory_Planeswalkers.getCard(card, cardName);
|
||||||
} else if (card.isLand()) {
|
} else if (card.isLand()) {
|
||||||
card2 = CardFactory_Lands.getCard(card, cardName, owner, this);
|
card2 = CardFactory_Lands.getCard(card, cardName, this);
|
||||||
} else if (card.isInstant()) {
|
} else if (card.isInstant()) {
|
||||||
card2 = CardFactory_Instants.getCard(card, cardName, owner);
|
card2 = CardFactory_Instants.getCard(card, cardName);
|
||||||
} else if (card.isSorcery()) {
|
} else if (card.isSorcery()) {
|
||||||
card2 = CardFactory_Sorceries.getCard(card, cardName, owner);
|
card2 = CardFactory_Sorceries.getCard(card, cardName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (card2 != null) {
|
if (card2 != null) {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class CardFactory_Auras {
|
|||||||
* @param owner a {@link forge.Player} object.
|
* @param owner a {@link forge.Player} object.
|
||||||
* @return a {@link forge.Card} 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 **************************
|
//*************** START *********** START **************************
|
||||||
if (cardName.equals("Convincing Mirage") || cardName.equals("Phantasmal Terrain")
|
if (cardName.equals("Convincing Mirage") || cardName.equals("Phantasmal Terrain")
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ public class CardFactory_Creatures {
|
|||||||
* @param cf a {@link forge.card.cardFactory.CardFactoryInterface} object.
|
* @param cf a {@link forge.card.cardFactory.CardFactoryInterface} object.
|
||||||
* @return a {@link forge.Card} 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 **************************
|
//*************** START *********** START **************************
|
||||||
if (cardName.equals("Force of Savagery")) {
|
if (cardName.equals("Force of Savagery")) {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class CardFactory_Equipment {
|
|||||||
* @param owner a {@link forge.Player} object.
|
* @param owner a {@link forge.Player} object.
|
||||||
* @return a {@link forge.Card} 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 **************************
|
//*************** START *********** START **************************
|
||||||
if (cardName.equals("Umbral Mantle")) {
|
if (cardName.equals("Umbral Mantle")) {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class CardFactory_Instants {
|
|||||||
* @param owner a {@link forge.Player} object.
|
* @param owner a {@link forge.Player} object.
|
||||||
* @return a {@link forge.Card} 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 **************************
|
//*************** START *********** START **************************
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class CardFactory_Lands {
|
|||||||
* @param cf a {@link forge.card.cardFactory.CardFactoryInterface} object.
|
* @param cf a {@link forge.card.cardFactory.CardFactoryInterface} object.
|
||||||
* @return a {@link forge.Card} 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 **************************
|
//*************** START *********** START **************************
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class CardFactory_Planeswalkers {
|
|||||||
* @param owner a {@link forge.Player} object.
|
* @param owner a {@link forge.Player} object.
|
||||||
* @return a {@link forge.Card} 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
|
// All Planeswalkers set their loyality in the beginning
|
||||||
if (card.getBaseLoyalty() > 0)
|
if (card.getBaseLoyalty() > 0)
|
||||||
card.addComesIntoPlayCommand(CardFactoryUtil.entersBattleFieldWithCounters(card, Counters.LOYALTY, card.getBaseLoyalty()));
|
card.addComesIntoPlayCommand(CardFactoryUtil.entersBattleFieldWithCounters(card, Counters.LOYALTY, card.getBaseLoyalty()));
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class CardFactory_Sorceries {
|
|||||||
* @param owner a {@link forge.Player} object.
|
* @param owner a {@link forge.Player} object.
|
||||||
* @return a {@link forge.Card} 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 **************************
|
//*************** START *********** START **************************
|
||||||
if (cardName.equals("Political Trickery")) {
|
if (cardName.equals("Political Trickery")) {
|
||||||
|
|||||||
Reference in New Issue
Block a user