From f023a1962f97c5027ee5b34271952f2b398d99a6 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 20 Feb 2017 21:43:10 +0100
Subject: [PATCH] Rain now extinguishes fire, lightning now always makes fire

---
 mods/ENVIRONMENT/lightning/init.lua    | 7 ++-----
 mods/ENVIRONMENT/weather_pack/rain.lua | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index 6f0901f4ac..6880cf106d 100644
--- a/mods/ENVIRONMENT/lightning/init.lua
+++ b/mods/ENVIRONMENT/lightning/init.lua
@@ -150,11 +150,8 @@ lightning.strike = function(pos)
 	pos2.y = pos2.y + 1/2
 	if minetest.get_item_group(minetest.get_node({x = pos2.x, y = pos2.y - 1, z = pos2.z}).name, "liquid") < 1 then
 		if minetest.get_node(pos2).name == "air" then
-			-- Rarely cause a fire
-			-- TODO: Always cause a fire, but the rain should put out fires then
-			if rng:next(1, 100) == 1 then
-				minetest.set_node(pos2, {name = "mcl_fire:fire"})
-			end
+			-- Cause a fire
+			minetest.set_node(pos2, {name = "mcl_fire:fire"})
 		end
 	end
 
diff --git a/mods/ENVIRONMENT/weather_pack/rain.lua b/mods/ENVIRONMENT/weather_pack/rain.lua
index cd2bb783a5..aae8c17c95 100644
--- a/mods/ENVIRONMENT/weather_pack/rain.lua
+++ b/mods/ENVIRONMENT/weather_pack/rain.lua
@@ -172,7 +172,7 @@ end
 -- ABM for extinguish fire
 if weather.allow_abm then
   minetest.register_abm({
-    nodenames = {"fire:basic_flame"},
+    nodenames = {"mcl_fire:fire"},
     interval = 4.0,
     chance = 2,
     action = function(pos, node, active_object_count, active_object_count_wider)
@@ -183,4 +183,4 @@ if weather.allow_abm then
       end
     end
   })
-end
\ No newline at end of file
+end