From caa3d45e02ceeb0fb52341621f20ff4aa42b5405 Mon Sep 17 00:00:00 2001
From: Vasco Lavos <vasco.men@hotmail.com>
Date: Wed, 11 Jun 2014 13:09:40 +0100
Subject: [PATCH] Added some sanity checking to the flowers' connection code.

---
 MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java | 2 +-
 MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java b/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java
index 420977cd2..d83ec2f27 100644
--- a/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java
+++ b/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java
@@ -97,7 +97,7 @@ public class SubTileFunctional extends SubTileEntity {
 		if(linkedPool == null) {
 			needsNew = true;
 
-			if(cachedPoolCoordinates != null) {
+			if(cachedPoolCoordinates != null && supertile.getWorldObj().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) {
 				TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ);
 				if(tileAt != null && tileAt instanceof IManaPool) {
 					linkedPool = tileAt;
diff --git a/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java b/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java
index e5a31564f..76c384df9 100644
--- a/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java
+++ b/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java
@@ -16,6 +16,7 @@ import java.awt.Color;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -52,7 +53,7 @@ public class SubTileGenerating extends SubTileEntity {
 	@Override
 	public void onUpdate() {
 		super.onUpdate();
-
+		
 		linkCollector();
 
 		if(canGeneratePassively()) {
@@ -80,7 +81,7 @@ public class SubTileGenerating extends SubTileEntity {
 		if(linkedCollector == null) {
 			needsNew = true;
 
-			if(cachedCollectorCoordinates != null) {
+			if(cachedCollectorCoordinates != null && supertile.getWorldObj().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) {
 				TileEntity tileAt = supertile.getWorldObj().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ);
 				if(tileAt != null && tileAt instanceof IManaCollector) {
 					linkedCollector = tileAt;