github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play.

Browse source
This commit is contained in:
LevelX2 2017-02-03 20:45:47 +01:00
parent 04f9ff9f60
commit a5299e3a30
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/serverlist.txt
View file

@ -1,5 +1,6 @@
XMage.de 1 (Europe/Germany) fast :xmage.de:17171 XMage.de 1 (Europe/Germany) fast :xmage.de:17171
woogerworks (North America/USA) :xmage.woogerworks.com: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 XMageBr. (South America/Brazil) :magic.ncs3sistemas.com.br:17171
XMage.tahiti :xmage.tahiti.one:443 XMage.tahiti :xmage.tahiti.one:443
Seedds Server (Asia) :115.29.203.80:17171 Seedds Server (Asia) :115.29.203.80:17171

16
Mage/src/main/java/mage/cards/repository/CardInfo.java
View file

@ -30,11 +30,16 @@ package mage.cards.repository;
import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DataType;
import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable; 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.ObjectColor;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.SpellAbility; import mage.abilities.SpellAbility;
import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility; import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardGraphicInfo;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.cards.FrameStyle; import mage.cards.FrameStyle;
@ -45,11 +50,6 @@ import mage.constants.Rarity;
import mage.constants.SpellAbilityType; import mage.constants.SpellAbilityType;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/** /**
* *
* @author North * @author North
@ -205,7 +205,7 @@ public class CardInfo {
} }
public Card getCard() { 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() { public Card getMockCard() {
@ -216,7 +216,9 @@ public class CardInfo {
} }
} }
public boolean usesVariousArt() { return variousArt; } public boolean usesVariousArt() {
return variousArt;
}
public ObjectColor getColor() { public ObjectColor getColor() {
ObjectColor color = new ObjectColor(); ObjectColor color = new ObjectColor();