From 3e6d4ecc0cab66ea902aa402cf4f8d13ea5528de Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 9 Mar 2013 06:50:53 +0000
Subject: [PATCH 1/2] A hardcode to use cards from 6ED whenever S00 card is not
 found

---
 src/main/java/forge/ImageLoader.java | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/forge/ImageLoader.java b/src/main/java/forge/ImageLoader.java
index 62a5d975e03..34358255317 100644
--- a/src/main/java/forge/ImageLoader.java
+++ b/src/main/java/forge/ImageLoader.java
@@ -32,14 +32,14 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
             path = ForgeProps.getFile(NewConstants.IMAGE_BASE);
         }
 
-        File file = null;
-        boolean isPng = filename.endsWith(".png");
-        final String fName = isPng || filename.endsWith(".jpg") ? filename : filename + ".jpg";
-        file = new File(path, fName);
-        if (!file.exists()) {
-            // DEBUG
-            //System.out.println("File not found, no image created: "
-            //+ file);
+        File file = makeImageFile(path, filename);
+        boolean fileExists = file.exists();
+        if (!fileExists && filename.startsWith("S00") ) {
+            file = makeImageFile(path, filename.replace("S00", "6ED"));
+            fileExists = file.exists();
+        }
+        if (!fileExists ) {
+            //System.out.println("File not found, no image created: " + file);
             return null;
         }
         final BufferedImage image = getImage(file);
@@ -47,6 +47,18 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
         return image;
     }
 
+    /**
+     * TODO: Write javadoc for this method.
+     * @param path
+     * @param filename
+     * @return
+     */
+    private File makeImageFile(File path, String filename) {
+        boolean isPng = filename.endsWith(".png");
+        final String fName = isPng || filename.endsWith(".jpg") ? filename : filename + ".jpg";
+        return new File(path, fName);
+    }
+
     /**
      * <p>
      * getImage.

From d91545cfb3380134b3f7309e3e3576760af1ea7c Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 9 Mar 2013 06:51:31 +0000
Subject: [PATCH 2/2] when a second game in the match starts, player will be
 shown directly the mulligan input

---
 src/main/java/forge/game/GameNew.java         | 1 -
 src/main/java/forge/game/MatchController.java | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index 98c15656cbd..35d695e2785 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -85,7 +85,6 @@ public class GameNew {
      * their decks and other special starting conditions.
      */
     public static void newGame(final MatchController match, final Map<Player, PlayerStartConditions> playersConditions, final GameState game, final boolean canRandomFoil) {
-        match.getInput().clearInput();
 
         Card.resetUniqueNumber();
         // need this code here, otherwise observables fail
diff --git a/src/main/java/forge/game/MatchController.java b/src/main/java/forge/game/MatchController.java
index ea051d1e83d..76f086d8db3 100644
--- a/src/main/java/forge/game/MatchController.java
+++ b/src/main/java/forge/game/MatchController.java
@@ -159,7 +159,10 @@ public class MatchController {
 
             final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed;
             GameNew.newGame(this, startConditions, currentGame, canRandomFoil);
-
+            
+            getInput().clearInput();
+            getInput().resetInput();
+            
             Thread thGame = new GameInputUpdatesThread(this, currentGame);
             thGame.setName("Game input updater");
             thGame.start();