From 57c9c59754b95e718a88ac4486fef900e0b43011 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Wed, 17 Aug 2016 00:11:30 +0200
Subject: [PATCH] Fix grid crashes, fixes issues #271 and #266

---
 CHANGELOG.md                                       | 3 +++
 src/main/java/refinedstorage/gui/grid/GuiGrid.java | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3815cc01..5f6df7b3e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Refined Storage Changelog
 
 ### 0.9
+**Bugfixes**
+- Fixed crash with Grid
+
 **Features**
 - Added fluid storage
 - Usage of Wireless Grid is now configurable
diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
index eea5f1c57..066c1495f 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
@@ -1,7 +1,8 @@
 package refinedstorage.gui.grid;
 
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
@@ -41,8 +42,8 @@ public class GuiGrid extends GuiBase {
     public static final GridSortingQuantity SORTING_QUANTITY = new GridSortingQuantity();
     public static final GridSortingName SORTING_NAME = new GridSortingName();
 
-    public static Multimap<Item, ClientStackItem> ITEMS = ArrayListMultimap.create();
-    public static Multimap<Fluid, ClientStackFluid> FLUIDS = ArrayListMultimap.create();
+    public static final ListMultimap<Item, ClientStackItem> ITEMS = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+    public static final ListMultimap<Fluid, ClientStackFluid> FLUIDS = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
 
     public static List<IClientStack> STACKS = new ArrayList<>();
 
@@ -108,7 +109,7 @@ public class GuiGrid extends GuiBase {
         List<IClientStack> stacks = new ArrayList<>();
 
         if (grid.isConnected()) {
-            stacks.addAll(grid.getType() == EnumGridType.FLUID ? new ArrayList<>(FLUIDS.values()) : new ArrayList<>(ITEMS.values()));
+            stacks.addAll(grid.getType() == EnumGridType.FLUID ? FLUIDS.values() : ITEMS.values());
 
             String query = searchField.getText().trim().toLowerCase();