From 8d04af28ccee82a90cdad3920a9660285bffe333 Mon Sep 17 00:00:00 2001
From: Vasco Lavos <vasco.men@hotmail.com>
Date: Wed, 21 May 2014 13:47:25 +0100
Subject: [PATCH] Fixed the Jaded Amaranthus being able to place flowers in
 running water, basically creating instant farms.

---
 .../block/subtile/functional/SubTileJadedAmaranthus.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
index 52554b6ef..042be784d 100644
--- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
+++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
@@ -12,6 +12,7 @@
 package vazkii.botania.common.block.subtile.functional;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.subtile.SubTileFunctional;
@@ -38,7 +39,8 @@ public class SubTileJadedAmaranthus extends SubTileFunctional {
 
 			for(int i = 0; i < range * 2; i++) {
 				Block block = supertile.getWorldObj().getBlock(x, y, z);
-				if((block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland) && (supertile.getWorldObj().isAirBlock(x, y + 1, z) || supertile.getWorldObj().getBlock(x, y + 1, z).isReplaceable(supertile.getWorldObj(), x, y + 1, z))) {
+				Block blockAbove = supertile.getWorldObj().getBlock(x, y + 1, z);
+				if((block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland) && (supertile.getWorldObj().isAirBlock(x, y + 1, z) || (blockAbove.isReplaceable(supertile.getWorldObj(), x, y + 1, z) && blockAbove.getMaterial() != Material.water))) {
 					int color = supertile.getWorldObj().rand.nextInt(16);
 					if(ModBlocks.flower.canBlockStay(supertile.getWorldObj(), x, y + 1, z)) {
 						if(ConfigHandler.blockBreakParticles)