From 40e7e0d290c912949ac308bc01463a6f5198a601 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 May 2017 04:10:07 +1000
Subject: [PATCH] Fix biome coloring

---
 .../fawe/jnbt/anvil/HeightMapMCAGenerator.java   | 16 ++--------------
 .../regions/general/plot/CreateFromImage.java    |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java b/core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java
index 2576cd9f..5fc099d9 100644
--- a/core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java
+++ b/core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java
@@ -293,20 +293,8 @@ public class HeightMapMCAGenerator extends MCAWriter implements Extent {
                 BaseBlock block = textureUtil.getNearestBlock(color);
                 TextureUtil.BiomeColor biome = textureUtil.getNearestBiome(color);
                 int blockColor = textureUtil.getColor(block);
-                if (textureUtil.colorDistance(biome.grass, color) - biomePriority <= textureUtil.colorDistance(blockColor, color)) {
-                    byte biomeByte = (byte) biome.id;
-                    biomes[index] = biomeByte;
-                    if (yBiome && x > 0 && x < widthIndex) {
-                        setBiomeIfZero(index + 1, biomeByte);
-                        setBiomeIfZero(index - 1, biomeByte);
-                        setBiomeIfZero(index + getWidth(), biomeByte);
-                        setBiomeIfZero(index + getWidth() + 1, biomeByte);
-                        setBiomeIfZero(index + getWidth() - 1, biomeByte);
-                        setBiomeIfZero(index - getWidth(), biomeByte);
-                        setBiomeIfZero(index - getWidth() + 1, biomeByte);
-                        setBiomeIfZero(index - getWidth() - 1, biomeByte);
-                    }
-                } else {
+                biomes[index] = (byte) biome.id;
+                if (textureUtil.colorDistance(biome.grass, color) - biomePriority > textureUtil.colorDistance(blockColor, color)) {
                     char combined = (char) block.getCombined();
                     main[index] = combined;
                     floor[index] = combined;
diff --git a/core/src/main/java/com/boydti/fawe/regions/general/plot/CreateFromImage.java b/core/src/main/java/com/boydti/fawe/regions/general/plot/CreateFromImage.java
index 86f37879..9fd2df22 100644
--- a/core/src/main/java/com/boydti/fawe/regions/general/plot/CreateFromImage.java
+++ b/core/src/main/java/com/boydti/fawe/regions/general/plot/CreateFromImage.java
@@ -145,8 +145,8 @@ public class CreateFromImage extends Command {
                             fp.sendMessage(BBC.getPrefix() + "/2 cfi ore[s]");
                             fp.sendMessage(BBC.getPrefix() + "/2 cfi schem <mask> <schem> <rarity> <rotate>");
                             fp.sendMessage(BBC.getPrefix() + "/2 cfi height <image-url|height>");
-                            fp.sendMessage(BBC.getPrefix() + "/2 cfi waterheight <height>");
-                            fp.sendMessage(BBC.getPrefix() + "/2 cfi waterid <number-id>");
+                            fp.sendMessage(BBC.getPrefix() + "/2 cfi waterHeight <height>");
+                            fp.sendMessage(BBC.getPrefix() + "/2 cfi waterId <number-id>");
                             fp.sendMessage(BBC.getPrefix() + "/2 cfi color <image-url>");
                             fp.sendMessage(BBC.getPrefix() + "/2 cfi glass <image-url>");
                             fp.sendMessage(BBC.getPrefix() + "/2 cfi biomeColor <image-url>");