From 8773c4b52f50dade0d7330e21e45401dce544ee2 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sun, 11 Jun 2017 02:34:34 +0200
Subject: [PATCH] Remove clouds when in void

---
 mods/ENVIRONMENT/weather_pack/rain.lua     | 2 +-
 mods/ENVIRONMENT/weather_pack/skycolor.lua | 6 +++---
 mods/PLAYER/mcl_playerplus/init.lua        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mods/ENVIRONMENT/weather_pack/rain.lua b/mods/ENVIRONMENT/weather_pack/rain.lua
index f8712fa98c..18ed060565 100644
--- a/mods/ENVIRONMENT/weather_pack/rain.lua
+++ b/mods/ENVIRONMENT/weather_pack/rain.lua
@@ -92,7 +92,7 @@ end
 rain.remove_player = function(player)
   local player_meta = weather.players[player:get_player_name()]
   if player_meta ~= nil and player_meta.origin_sky ~= nil then
-    player:set_sky(player_meta.origin_sky[1], player_meta.origin_sky[2], player_meta.origin_sky[3])
+    player:set_sky(player_meta.origin_sky[1], player_meta.origin_sky[2], player_meta.origin_sky[3], true)
     player:set_clouds({color="#FFF0F0E5"})
     weather.players[player:get_player_name()] = nil
   end
diff --git a/mods/ENVIRONMENT/weather_pack/skycolor.lua b/mods/ENVIRONMENT/weather_pack/skycolor.lua
index e7f8b11d2d..6fe3870b1e 100644
--- a/mods/ENVIRONMENT/weather_pack/skycolor.lua
+++ b/mods/ENVIRONMENT/weather_pack/skycolor.lua
@@ -75,7 +75,7 @@ skycolor = {
 		for _, player in ipairs(players) do
 			local pos = player:getpos()
 			if pos.y >= mcl_vars.mg_bedrock_overworld_max then
-				player:set_sky(color, "plain", nil)
+				player:set_sky(color, "plain", nil, true)
 			end
 		end
 	end,
@@ -113,7 +113,7 @@ skycolor = {
 		for _, player in ipairs(players) do
 			local pos = player:getpos()
 			if pos.y >= mcl_vars.mg_bedrock_overworld_max then
-				player:set_sky(color, "plain", nil)
+				player:set_sky(color, "plain", nil, true)
 			end
 		end
 	end,
@@ -126,7 +126,7 @@ skycolor = {
 		for _, player in ipairs(players) do
 			local pos = player:getpos()
 			if pos.y >= mcl_vars.mg_bedrock_overworld_max then
-				player:set_sky(nil, "regular", nil)
+				player:set_sky(nil, "regular", nil, true)
 			end
 		end
 	end,
diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index f6a4dde3e5..e5aa899c54 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -178,7 +178,7 @@ minetest.register_globalstep(function(dtime)
 		-- Apply black sky in the Void and deal Void damage
 		if pos.y < mcl_vars.mg_bedrock_overworld_max then
 			-- Player reached the void, set black sky box
-			player:set_sky("#000000", "plain")
+			player:set_sky("#000000", "plain", nil, false)
 			-- FIXME: Sky handling in MCL2 is held together with lots of duct tape.
 			-- This only works beause weather_pack currently does not touch the sky for players below the height used for this check.
 			-- There should be a real skybox API.