From 096b4f7e12f4c83099db387d5ce6cfa29161354d Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Thu, 25 Sep 2014 16:03:49 +0000
Subject: [PATCH] Ensure caches cleared between games

---
 forge-gui/src/main/java/forge/match/MatchUtil.java | 8 ++++++--
 forge-gui/src/main/java/forge/view/Cache.java      | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/forge-gui/src/main/java/forge/match/MatchUtil.java b/forge-gui/src/main/java/forge/match/MatchUtil.java
index e652d8312f3..5d0d5db225e 100644
--- a/forge-gui/src/main/java/forge/match/MatchUtil.java
+++ b/forge-gui/src/main/java/forge/match/MatchUtil.java
@@ -164,8 +164,6 @@ public class MatchUtil {
             }
         });
 
-        gameViews.clear();
-
         int i = 0;
         int avatarIndex = 0;
         humanCount = 0;
@@ -393,6 +391,12 @@ public class MatchUtil {
         if (game == null) { return; }
 
         game = null;
+        gameViews.clear();
+        players.clear();
+        cards.clear();
+        spabs.clear();
+        stackItems.clear();
+
         controller.afterGameEnd();
     }
 
diff --git a/forge-gui/src/main/java/forge/view/Cache.java b/forge-gui/src/main/java/forge/view/Cache.java
index f5539d6ce54..c0643ca8b80 100644
--- a/forge-gui/src/main/java/forge/view/Cache.java
+++ b/forge-gui/src/main/java/forge/view/Cache.java
@@ -157,4 +157,9 @@ public class Cache<K extends IIdentifiable, V extends IIdentifiable> {
         cache.keySet().retainAll(Collections2.transform(keys, IIdentifiable.FN_GET_ID));
         inverseCache.values().retainAll(keys);
     }
+
+    public void clear() {
+        cache.clear();
+        inverseCache.clear();
+    }
 }