From c469db91992b44098c5683ae3e07a08299b1f2e3 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Mon, 23 May 2016 23:48:16 +0200
Subject: [PATCH] Fixed Crafting Grid / Pattern Grid not throwing items on
 break

---
 CHANGELOG.md                                          | 3 +++
 src/main/java/refinedstorage/tile/TileController.java | 8 +++++---
 src/main/java/refinedstorage/tile/TileStorage.java    | 8 +++++---
 src/main/java/refinedstorage/tile/grid/TileGrid.java  | 8 +++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 825645a05..e6d3501f8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Refined Storage Changelog
 
 ### 0.7
+**Bugfixes**
+- Fixed Crafting Grid / Pattern Grid not throwing items on break
+
 **Features**
 - Port to Minecraft 1.9.4
 
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 95153e0ab..6f8f26ea4 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -71,6 +71,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
     public static final int MAX_CRAFTING_QUANTITY_PER_REQUEST = 500;
 
+    private EnumControllerType type;
+
     private List<ItemGroup> itemGroups = new ArrayList<ItemGroup>();
     private List<IStorage> storages = new ArrayList<IStorage>();
     private List<WirelessGridConsumer> wirelessGridConsumers = new ArrayList<WirelessGridConsumer>();
@@ -255,11 +257,11 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
     }
 
     public EnumControllerType getType() {
-        if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) {
-            return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) {
+            this.type = (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
         }
 
-        return EnumControllerType.NORMAL;
+        return type;
     }
 
     public int getWirelessGridRange() {
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index bb3723566..77c8df5d2 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -32,6 +32,8 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
 
     private StorageBlockStorage storage;
 
+    private EnumStorageType type;
+
     private int priority = 0;
     private int compare = 0;
     private int mode = ModeConstants.WHITELIST;
@@ -101,11 +103,11 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
     }
 
     public EnumStorageType getType() {
-        if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) {
-            return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE));
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) {
+            this.type = ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE));
         }
 
-        return EnumStorageType.TYPE_1K;
+        return type;
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index 411baa052..281e72322 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -61,6 +61,8 @@ public class TileGrid extends TileMachine implements IGrid {
 
     private BasicItemHandler patterns = new BasicItemHandler(2, this, new BasicItemValidator(RefinedStorageItems.PATTERN));
 
+    private EnumGridType type;
+
     private int sortingDirection = SORTING_DIRECTION_DESCENDING;
     private int sortingType = SORTING_TYPE_NAME;
     private int searchBoxMode = SEARCH_BOX_MODE_NORMAL;
@@ -77,11 +79,11 @@ public class TileGrid extends TileMachine implements IGrid {
     }
 
     public EnumGridType getType() {
-        if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) {
-            return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE);
+        if (type == null && worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) {
+            this.type = (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE);
         }
 
-        return EnumGridType.NORMAL;
+        return type;
     }
 
     @Override