Merge pull request 'Fix most deaths not producing a death message.' (#3332) from CyberMango/MineClone2:dev/mango/fix_mt_deaths_messages into master

Reviewed-on: MineClone2/MineClone2#3332
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>

mods/CORE/mcl_damage/init.lua

@@ -155,7 +155,6 @@ end, true)
 minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
 	if not damage_enabled then return 0 end
 	if player:get_hp() > 0 then
-		mt_reason.approved = true
 		if hp_change < 0 then
 			mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason))
 		end
@@ -163,9 +162,7 @@ minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
 end, false)
 
 minetest.register_on_dieplayer(function(player, mt_reason)
-	if mt_reason.approved then
-		mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
-	end
+	mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
 	minetest.log("action","Player "..player:get_player_name().." died at "..minetest.pos_to_string(vector.round(player:get_pos())))
 end)
 

mods/ENVIRONMENT/mcl_weather/skycolor.lua

@@ -210,23 +210,9 @@ mcl_weather.skycolor = {
 					end
 				end
 			elseif dim == "end" then
-				local biomesky = "#000000"
-				local biomefog = "#A080A0"
-				if mg_name ~= "v6" and mg_name ~= "singlenode" then
-					local biome_index = minetest.get_biome_data(player:get_pos()).biome
-					local biome_name = minetest.get_biome_name(biome_index)
-					local biome = minetest.registered_biomes[biome_name]
-					if biome then
-						--minetest.log("action", string.format("Biome found for number: %s in biome: %s", tostring(biome_index), biome_name))
-						biomesky = biome._mcl_skycolor
-						biomefog = biome._mcl_fogcolor -- The End biomes seemingly don't use the fog colour, despite having this value according to the wiki. The sky colour is seemingly used for both sky and fog?
-					else
-						--minetest.log("action", string.format("No biome for number: %s in biome: %s", tostring(biome_index), biome_name))
-					end
-				end
 				local t = "mcl_playerplus_end_sky.png"
 				player:set_sky({ type = "skybox",
-					base_color = biomesky,
+					base_color = "#000000",
 					textures = {t,t,t,t,t,t},
 					clouds = false,
 				})
@@ -235,29 +221,24 @@ mcl_weather.skycolor = {
 				player:set_stars({visible = false})
 				mcl_weather.skycolor.override_day_night_ratio(player, 0.5)
 			elseif dim == "nether" then
-				local biomesky = "#6EB1FF"
-				local biomefog = "#330808"
-				if mg_name ~= "v6" and mg_name ~= "singlenode" then
-					local biome_index = minetest.get_biome_data(player:get_pos()).biome
-					local biome_name = minetest.get_biome_name(biome_index)
-					local biome = minetest.registered_biomes[biome_name]
-					if biome then
-						--minetest.log("action", string.format("Biome found for number: %s in biome: %s", tostring(biome_index), biome_name))
-						biomesky = biome._mcl_skycolor -- The Nether biomes seemingly don't use the sky colour, despite having this value according to the wiki. The fog colour is used for both sky and fog.
-						biomefog = biome._mcl_fogcolor
-					else
-						--minetest.log("action", string.format("No biome for number: %s in biome: %s", tostring(biome_index), biome_name))
-					end
-				end
+				local nether_sky = {
+					Nether = "#300808",
+					BasaltDelta = "#685F70",
+					SoulsandValley = "#1B4745",
+					CrimsonForest = "#330303",
+					WarpedForest = "#1A051A"
+				}
+				local biometint = nether_sky[minetest.get_biome_name(minetest.get_biome_data(player:get_pos()).biome)]
+
 				mcl_weather.set_sky_color(player, {
 					type = "regular",
 					sky_color = {
-						day_sky = biomefog,
-						day_horizon = biomefog,
-						dawn_sky = biomefog,
-						dawn_horizon = biomefog,
-						night_sky = biomefog,
-						night_horizon = biomefog,
+						day_sky = "#300808",
+						day_horizon = biometint,
+						dawn_sky = "#300808",
+						dawn_horizon = biometint,
+						night_sky = "#300808",
+						night_horizon = biometint,
 					},
 					clouds = false,
 				})

mods/MAPGEN/mcl_biomes/init.lua

@@ -1,12 +1,3 @@
-local overworld_fogcolor = "#C0D8FF"
-local beach_skycolor = "#78A7FF" -- This is the case for all beach biomes except for the snowy ones! Those beaches will have their own colour instead of this one.
-local ocean_skycolor = "#7BA4FF" -- This is the case for all ocean biomes except for non-deep frozen oceans! Those oceans will have their own colour instead of this one.
-
-local nether_skycolor = "#6EB1FF" -- The Nether biomes seemingly don't use the sky colour, despite having this value according to the wiki. The fog colour is used for both sky and fog.
-
-local end_skycolor = "#000000"
-local end_fogcolor = "#A080A0" -- The End biomes seemingly don't use the fog colour, despite having this value according to the wiki. The sky colour is used for both sky and fog.
-
 local mg_name = minetest.get_mapgen_setting("mg_name")
 local mg_seed = minetest.get_mapgen_setting("seed")
 
@@ -143,6 +134,15 @@ local function register_biomes()
 		"BambooJungleEdgeM",
 	}
 
+local beach_skycolor = "#78A7FF" -- This is the case for all beach biomes except for the snowy ones! Those beaches will have their own colour instead of this one.
+local ocean_skycolor = "#7BA4FF" -- This is the case for all ocean biomes except for non-deep frozen oceans! Those oceans will have their own colour instead of this one.
+local overworld_fogcolor = "#C0D8FF"
+
+local nether_skycolor = "#6EB1FF"
+
+local end_fogcolor = "#A080A0"
+local end_skycolor = "#000000"
+
 	-- Ice Plains Spikes (rare)
 	minetest.register_biome({
 		name = "IcePlainsSpikes",
@@ -1940,8 +1940,8 @@ local function register_dimension_biomes()
 		humidity_point = 0,
 		_mcl_biome_type = "hot",
 		_mcl_palette_index = 17,
-		_mcl_skycolor = nether_skycolor,
-		_mcl_fogcolor = "#330808"
+--		_mcl_skycolor = nether_skycolor,
+--		_mcl_fogcolor = "#330808"
 	})
 
 	minetest.register_decoration({
@@ -1971,8 +1971,8 @@ local function register_dimension_biomes()
 		humidity_point = 33,
 		_mcl_biome_type = "hot",
 		_mcl_palette_index = 17,
-		_mcl_skycolor = nether_skycolor,
-		_mcl_fogcolor = "#1B4745"
+--		_mcl_skycolor = nether_skycolor,
+--		_mcl_fogcolor = "#1B4745"
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
@@ -2022,8 +2022,8 @@ local function register_dimension_biomes()
 		humidity_point = 47,
 		_mcl_biome_type = "hot",
 		_mcl_palette_index = 17,
-		_mcl_skycolor = nether_skycolor,
-		_mcl_fogcolor = "#330303"
+--		_mcl_skycolor = nether_skycolor,
+--		_mcl_fogcolor = "#330303"
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
@@ -2051,8 +2051,8 @@ local function register_dimension_biomes()
 		humidity_point = 70,
 		_mcl_biome_type = "hot",
 		_mcl_palette_index = 17,
-		_mcl_skycolor = nether_skycolor,
-		_mcl_fogcolor = "#1A051A"
+--		_mcl_skycolor = nether_skycolor,
+--		_mcl_fogcolor = "#1A051A"
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
@@ -2080,8 +2080,8 @@ local function register_dimension_biomes()
 		humidity_point = 80,
 		_mcl_biome_type = "hot",
 		_mcl_palette_index = 17,
-		_mcl_skycolor = nether_skycolor,
-		_mcl_fogcolor = "#685F70"
+--		_mcl_skycolor = nether_skycolor,
+--		_mcl_fogcolor = "#685F70"
 	})
 
 	minetest.register_decoration({
@@ -2134,8 +2134,8 @@ local function register_dimension_biomes()
 		vertical_blend = 16,
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 	minetest.register_biome({
 		name = "EndBarrens",
@@ -2151,8 +2151,8 @@ local function register_dimension_biomes()
 		vertical_blend = 16,
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 	minetest.register_biome({
 		name = "EndMidlands",
@@ -2168,8 +2168,8 @@ local function register_dimension_biomes()
 		vertical_blend = 16,
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 	minetest.register_biome({
 		name = "EndHighlands",
@@ -2185,8 +2185,8 @@ local function register_dimension_biomes()
 		vertical_blend = 16,
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 	minetest.register_biome({
 		name = "EndSmallIslands",
@@ -2202,8 +2202,8 @@ local function register_dimension_biomes()
 		vertical_blend = 16,
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 
 	minetest.register_biome({
@@ -2222,8 +2222,8 @@ local function register_dimension_biomes()
 		min_pos = {x = -1250, y = mcl_vars.mg_end_min, z = -1250},
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 
 	minetest.register_biome({
@@ -2240,8 +2240,8 @@ local function register_dimension_biomes()
 		vertical_blend = 16,
 		_mcl_biome_type = "medium",
 		_mcl_palette_index = 0,
-		_mcl_skycolor = end_skycolor,
-		_mcl_fogcolor = end_fogcolor
+--		_mcl_skycolor = end_skycolor,
+--		_mcl_fogcolor = end_fogcolor
 	})
 
 end