From cd67354725656761fe36e1bb43ec22db829d5f2e Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Mon, 27 Sep 2021 02:31:18 +0200
Subject: [PATCH] fix various little errors

---
 mods/ENVIRONMENT/mcl_weather/init.lua     | 5 +++--
 mods/ENVIRONMENT/mcl_weather/rain.lua     | 7 ++++---
 mods/ENVIRONMENT/mcl_weather/skycolor.lua | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mods/ENVIRONMENT/mcl_weather/init.lua b/mods/ENVIRONMENT/mcl_weather/init.lua
index fb3c0abd..8041570e 100644
--- a/mods/ENVIRONMENT/mcl_weather/init.lua
+++ b/mods/ENVIRONMENT/mcl_weather/init.lua
@@ -191,6 +191,7 @@ function mcl_weather.stop_weather(def)
 	end)
 	if def.skylayer then
 		mcl_weather.skycolor.remove_layer("weather")
+		mcl_weather.skycolor.force_update=true
 		mcl_weather.skycolor.update_sky_color()
 	end
 end
@@ -310,7 +311,7 @@ minetest.register_chatcommand("weather", {
 		local def=mcl_weather.get_weatherdef(param)
 		local old_weather=mcl_weather.current
 		if def then
-			mcl_weather.stop_weather(mcl_weather.get_weatherdef(mcl_weather.state))
+			mcl_weather.stop_weather(mcl_weather.get_weatherdef(mcl_weather.current))
 			if duration then
 				def.min_duration=duration
 				def.max_duration=duration
@@ -330,7 +331,7 @@ minetest.register_chatcommand("toggledownfall", {
 	func = function(name, param)
 		-- Currently rain/thunder/snow: Set weather to clear
 		if mcl_weather.state ~= "none" then
-			mcl_weather.change("none")
+			mcl_weather.change("none",true)
 
 		-- Currently clear: Set weather randomly to rain/thunder/snow
 		else
diff --git a/mods/ENVIRONMENT/mcl_weather/rain.lua b/mods/ENVIRONMENT/mcl_weather/rain.lua
index ab6a7d26..90448df3 100644
--- a/mods/ENVIRONMENT/mcl_weather/rain.lua
+++ b/mods/ENVIRONMENT/mcl_weather/rain.lua
@@ -6,6 +6,7 @@ mcl_weather.rain = {
 	raining = false
 }
 mcl_weather.raining = false
+
 mcl_weather.register_weather("rain",{
 	light_factor = 0.6,
 	cloudcolor= "#5D5D5FE8" ,
@@ -26,14 +27,14 @@ mcl_weather.register_weather("rain",{
 		{
 			amount = 800,
 			time = 0,
-			minpos = vector.new(-5,5,-5),
-			maxpos =vector.new(5,10,5),
+			minpos = vector.new(-10,10,-10),
+			maxpos =vector.new(10,15,10),
 			minvel = vector.new(0,-8,0),
 			maxvel = vector.new(0,-12,0),
 			minacc = vector.new(0,-20,0),
 			maxacc = vector.new(0,-30,0),
 			minexptime = 1,
-			maxexptime = 1,
+			maxexptime = 2,
 			minsize = 0.5,
 			maxsize = 5,
 			collisiondetection = true,
diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
index 6cc94b5c..2c089bf0 100644
--- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua
+++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
@@ -70,7 +70,7 @@ mcl_weather.skycolor = {
 		else
 			arg = ratio
 		end
-		player:override_day_night_ratio(arg)
+		if arg and arg >= 0 and arg <= 1 then player:override_day_night_ratio(arg) end
 	end,
 
 	-- Update sky color. If players not specified update sky for all players.