From 4f3f8b2c3a4994a2d320ca26da937c850002ea17 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Fri, 27 Nov 2015 09:19:32 +0000
Subject: Ice or snow above sea level melts into river water

---
 README.md |  1 +
 init.lua  |  2 +-
 water.lua | 15 +++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f91d928..13287f4 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Ethereal v7 Mapgen mod for Minetest
 - Tweaked biome plant and tree decorations
 - Fixed farming compatibility when using hoe on ethereal dirt
 - Dirt with dry grass turns into green grass when near water
+- Ice or snow above sea level melts into river water
 
 ### 1.18
 
diff --git a/init.lua b/init.lua
index 19bc308..b858afd 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 --[[
 
-	Minetest Ethereal Mod 1.19 (22th November 2015)
+	Minetest Ethereal Mod 1.19 (27th November 2015)
 
 	Created by ChinChow
 
diff --git a/water.lua b/water.lua
index e50fb64..1f13f51 100644
--- a/water.lua
+++ b/water.lua
@@ -86,17 +86,24 @@ minetest.register_abm({
 	interval = 5,
 	chance = 4,
 	catch_up = false,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos, node)
+
+		local water_node = "default:water"
+		if pos.y > 2 then
+			water_node = "default:river_water"
+		end
+
 		if node.name == "default:ice"
 		or node.name == "default:snowblock"
 		or node.name == "ethereal:icebrick"
 		or node.name == "ethereal:snowbrick" then
-			minetest.set_node(pos, {name = "default:water_source"})
+			minetest.set_node(pos, {name = water_node.."_source"})
 		elseif node.name == "default:snow" then
-			minetest.set_node(pos, {name = "default:water_flowing"})
+			minetest.set_node(pos, {name = water_node.."_flowing"})
 		elseif node.name == "default:dirt_with_snow" then
 			minetest.set_node(pos, {name = "default:dirt_with_grass"})
 		end
+
 		nodeupdate(pos)
 	end,
 })
@@ -108,7 +115,7 @@ minetest.register_abm({
 	interval = 15,
 	chance = 2,
 	catch_up = false,
-	action = function(pos, node, active_object_count, active_object_count_wider)
+	action = function(pos, node)
 		if node == "ethereal:dry_dirt" then
 			minetest.set_node(pos, {name = "default:dirt"})
 		else
-- 
cgit v1.2.3