Xmage 1.4.16v3

PwnedGalaxy · Oct 9, 2016 · 2e1f8c0 · 2e1f8c0
1 parent 27acaa5
commit 2e1f8c0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java
@@ -66,7 +66,7 @@ private static boolean cardViewEquals(CardView a, CardView b) {
         if (!a.getRarity().equals(b.getRarity())) {
             return false;
         }
-        if (!a.getCardNumber().equals(b.getCardNumber())) {
+        if (a.getCardNumber() != null && !a.getCardNumber().equals(b.getCardNumber())) {
             return false;
         }
         // Expansion set code, with null checking:

diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -57,7 +57,6 @@ public BufferedImage apply(String key) {
                 try {
 
                     boolean usesVariousArt = false;
-                    LOGGER.info("Key load to CACHE: " + key);
                     if (key.matches(".*#usesVariousArt.*")) {
                         usesVariousArt = true;
                         key = key.replace("#usesVariousArt", "");
@@ -130,9 +129,7 @@ public BufferedImage apply(String key) {
                             }
                         } else {
                             BufferedImage image = loadImage(file);
-                            LOGGER.info("Basic image: @" + Integer.toHexString(image.hashCode()));
                             image = getWizardsCard(image);
-                            LOGGER.info("Wizard image: @" + Integer.toHexString(image.hashCode()));
                             return image;
                         }
                     } else {

diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java
@@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
     public final static int MAGE_VERSION_MAJOR = 1;
     public final static int MAGE_VERSION_MINOR = 4;
     public final static int MAGE_VERSION_PATCH = 16;
-    public final static String MAGE_VERSION_MINOR_PATCH = "v2";
+    public final static String MAGE_VERSION_MINOR_PATCH = "v3";
     public final static String MAGE_VERSION_INFO = "";
 
     private final int major;

diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java
@@ -45,7 +45,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
-
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SetType;
@@ -65,7 +64,7 @@ public enum CardRepository {
     // raise this if db structure was changed
     private static final long CARD_DB_VERSION = 47;
     // raise this if new cards were added to the server
-    private static final long CARD_CONTENT_VERSION = 62;
+    private static final long CARD_CONTENT_VERSION = 63;
 
     private Dao<CardInfo, Object> cardDao;
     private Set<String> classNames;