From d3313d643887a04644db7f42a62041f1108697e8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 8 Mar 2018 16:59:39 -0500
Subject: [PATCH] Fixed outstanding block type crashes

---
 core/assets/version.properties                          | 2 +-
 core/src/io/anuke/mindustry/world/Tile.java             | 6 ++++++
 core/src/io/anuke/mindustry/world/blocks/BaseBlock.java | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index f0194caf42..d75e129abe 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,5 +1,5 @@
 #Autogenerated file. Do not modify.
-#Wed Mar 07 22:53:33 EST 2018
+#Thu Mar 08 16:59:18 EST 2018
 version=release
 androidBuildCode=407
 name=Mindustry
diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java
index aed26a1dbe..acdc1a201c 100644
--- a/core/src/io/anuke/mindustry/world/Tile.java
+++ b/core/src/io/anuke/mindustry/world/Tile.java
@@ -6,6 +6,9 @@ import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.reflect.ClassReflection;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.world.blocks.Blocks;
+import io.anuke.mindustry.world.blocks.types.modules.InventoryModule;
+import io.anuke.mindustry.world.blocks.types.modules.LiquidModule;
+import io.anuke.mindustry.world.blocks.types.modules.PowerModule;
 import io.anuke.ucore.function.Consumer;
 import io.anuke.ucore.util.Bits;
 import io.anuke.ucore.util.Mathf;
@@ -296,6 +299,9 @@ public class Tile{
 
 			if (block.destructible || block.update) {
 				entity = block.getEntity().init(this, block.update);
+				if(block.hasInventory) entity.inventory = new InventoryModule();
+				if(block.hasLiquids) entity.liquid = new LiquidModule();
+				if(block.hasPower) entity.power = new PowerModule();
 			}
 
 			updateOcclusion();
diff --git a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java
index 7162629be3..f76f8303c1 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BaseBlock.java
@@ -9,8 +9,8 @@ import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.util.Mathf;
 
 public abstract class BaseBlock {
+    public boolean hasInventory = true;
     public boolean hasLiquids;
-    public boolean hasInventory;
     public boolean hasPower;
 
     public int itemCapacity;