From 26a6dfbec7fc8b6879fa45e9248980bb8f126b36 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Mon, 1 May 2017 20:34:10 +1000
Subject: [PATCH] You shouldn't be able to fill over active water. (Thanks
 fam0r)

---
 MCGalaxy/Commands/building/CmdFill.cs | 2 +-
 MCGalaxy/Generator/RealisticMapGen.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MCGalaxy/Commands/building/CmdFill.cs b/MCGalaxy/Commands/building/CmdFill.cs
index ad0c07928..7c1520574 100644
--- a/MCGalaxy/Commands/building/CmdFill.cs
+++ b/MCGalaxy/Commands/building/CmdFill.cs
@@ -61,7 +61,7 @@ namespace MCGalaxy.Commands.Building {
             if (oldBlock == Block.custom_block)
                 oldExtBlock = p.level.GetExtTile(x, y, z);
 
-            if (!BlockPerms.CanModify(p, oldBlock) && !Block.BuildIn(oldBlock)) {
+            if (!BlockPerms.CanModify(p, oldBlock)) {
                 Formatter.MessageBlock(p, "fill over ", oldBlock); return false;
             }
             
diff --git a/MCGalaxy/Generator/RealisticMapGen.cs b/MCGalaxy/Generator/RealisticMapGen.cs
index 2282c636a..66b8abc20 100644
--- a/MCGalaxy/Generator/RealisticMapGen.cs
+++ b/MCGalaxy/Generator/RealisticMapGen.cs
@@ -154,7 +154,7 @@ namespace MCGalaxy.Generator {
                 int pos = x + Lvl.Width * (z + LiquidLevel * Lvl.Length);
                 for (ushort yy = 0; LiquidLevel - yy >= 0; yy++) {
                     if (LiquidLevel - yy > y) {
-                        Lvl.blocks[pos] = Block.water;    //better fill the water above me
+                        Lvl.blocks[pos] = Block.waterstill;    //better fill the water above me
                     } else if (LiquidLevel - yy > y - 3) {
                         byte block = overlay[index] < 0.75f ? Block.sand : Block.gravel; // sand on top
                         Lvl.blocks[pos] = block;