From a5299e3a3038dbdf3b1c8f9633695b24206707e8 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 3 Feb 2017 20:45:47 +0100 Subject: [PATCH] * Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play. --- Mage.Client/serverlist.txt | 1 + .../java/mage/cards/repository/CardInfo.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Mage.Client/serverlist.txt b/Mage.Client/serverlist.txt index 103f2b6336..2e71716dc9 100644 --- a/Mage.Client/serverlist.txt +++ b/Mage.Client/serverlist.txt @@ -1,5 +1,6 @@ XMage.de 1 (Europe/Germany) fast :xmage.de:17171 woogerworks (North America/USA) :xmage.woogerworks.com:17171 +xmage.lukeskywalk.com (North America) :xmage.lukeskywalk.com:17171 XMageBr. (South America/Brazil) :magic.ncs3sistemas.com.br:17171 XMage.tahiti :xmage.tahiti.one:443 Seedds Server (Asia) :115.29.203.80:17171 diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java index 3358bfa1fe..bf9f2977d7 100644 --- a/Mage/src/main/java/mage/cards/repository/CardInfo.java +++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java @@ -30,11 +30,16 @@ package mage.cards.repository; import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.cards.Card; +import mage.cards.CardGraphicInfo; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.FrameStyle; @@ -45,11 +50,6 @@ import mage.constants.Rarity; import mage.constants.SpellAbilityType; import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - /** * * @author North @@ -205,7 +205,7 @@ public class CardInfo { } public Card getCard() { - return CardImpl.createCard(className, new CardSetInfo(name, setCode, cardNumber, rarity)); + return CardImpl.createCard(className, new CardSetInfo(name, setCode, cardNumber, rarity, new CardGraphicInfo(FrameStyle.valueOf(frameStyle), variousArt))); } public Card getMockCard() { @@ -216,7 +216,9 @@ public class CardInfo { } } - public boolean usesVariousArt() { return variousArt; } + public boolean usesVariousArt() { + return variousArt; + } public ObjectColor getColor() { ObjectColor color = new ObjectColor();