diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index f8a2b971d3..eba18d1d3b 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -581,7 +581,7 @@ public class MageBook extends JComponent { } int start = page * conf.CARDS_PER_PAGE; int end = page * conf.CARDS_PER_PAGE + conf.CARDS_PER_PAGE; - int ttokens = getTotalNumTokens(set); + int ttokens = tokens.size(); int temblems = getTotalNumEmblems(set); int tplanes = getTotalNumPlanes(set); int numTokensEmblemsPlanes = ttokens + temblems + tplanes; diff --git a/Mage.Sets/src/mage/sets/PrereleaseEvents.java b/Mage.Sets/src/mage/sets/PrereleaseEvents.java index 8c551de767..265bed8f6e 100644 --- a/Mage.Sets/src/mage/sets/PrereleaseEvents.java +++ b/Mage.Sets/src/mage/sets/PrereleaseEvents.java @@ -322,4 +322,4 @@ public class PrereleaseEvents extends ExpansionSet { cards.add(new SetCardInfo("Zurgo Bellstriker", 197, Rarity.RARE, mage.cards.z.ZurgoBellstriker.class)); cards.add(new SetCardInfo("Zurgo Helmsmasher", 127, Rarity.SPECIAL, mage.cards.z.ZurgoHelmsmasher.class)); } -} +} \ No newline at end of file diff --git a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java index db1d907981..4306280617 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java @@ -37,6 +37,8 @@ import mage.MageInt; */ public class ChainersTormentNightmareToken extends TokenImpl { + public ChainersTormentNightmareToken() { this(0); }; + public ChainersTormentNightmareToken(int xValue) { super("Nightmare", "X/X black Nightmare artifact creature token"); cardType.add(CardType.CREATURE); diff --git a/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java index 951b7f611f..0ad9c13fbf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GeminiEngineTwinToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; public class GeminiEngineTwinToken extends TokenImpl { + public GeminiEngineTwinToken() { this(0, 0); } + public GeminiEngineTwinToken(int power, int toughness) { super("Twin", "colorless Construct artifact creature token named Twin that's attacking. Its power is equal to Gemini Engine's power and its toughness is equal to Gemini Engine's toughness."); cardType.add(CardType.ARTIFACT); diff --git a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java index 0fb51cb4cd..f9a49d222d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/RiptideReplicatorToken.java @@ -42,7 +42,7 @@ public class RiptideReplicatorToken extends TokenImpl { this(null, null, 1); } public RiptideReplicatorToken(ObjectColor color, SubType type, int x) { - super(type != null ? type.getDescription() : "null", "X/X creature token of the chosen color and type"); + super(type != null ? type.getDescription() : "", "X/X creature token of the chosen color and type"); cardType.add(CardType.CREATURE); if (color != null) { this.color.setColor(color); diff --git a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java index 59c6ec5fc4..0a4742ba19 100644 --- a/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/VolrathsLaboratoryToken.java @@ -42,7 +42,7 @@ public class VolrathsLaboratoryToken extends TokenImpl { this(null, null); } public VolrathsLaboratoryToken(ObjectColor color, SubType type) { - super(type != null ? type.getDescription() : "null", "2/2 creature token of the chosen color and type"); + super(type != null ? type.getDescription() : "", "2/2 creature token of the chosen color and type"); cardType.add(CardType.CREATURE); if (color != null) { this.color.setColor(color);