5 Add excessive checks for player when setting skybox attributes

This commit is contained in:
Juraj Vajda 2023-02-25 18:01:58 -05:00
parent 8431d0d53e
commit e401db74a3

View File

@ -738,7 +738,9 @@ minetest.register_globalstep(function(dtime)
sun_params.texture = sun_params.texture .. '^[transformFY' sun_params.texture = sun_params.texture .. '^[transformFY'
end end
player:set_sun(sun_params) if player then
player:set_sun(sun_params)
end
end end
-- if skybox_defs[biome_name].moon_parameters then -- if skybox_defs[biome_name].moon_parameters then
@ -761,40 +763,70 @@ minetest.register_globalstep(function(dtime)
sun_params.texture = sun_params.texture .. '^[transformFY' sun_params.texture = sun_params.texture .. '^[transformFY'
end end
player:set_sun(sun_params) if player then
player:set_sun(sun_params)
end
else else
player:set_sun() if player then
player:set_sun()
end
end end
if skybox_defs[biome_name].moon_parameters then if skybox_defs[biome_name].moon_parameters then
player:set_moon(skybox_defs[biome_name].moon_parameters) if player then
player:set_moon(skybox_defs[biome_name].moon_parameters)
end
else else
player:set_moon() if player then
player:set_moon()
end
end end
if skybox_defs[biome_name].sky_parameters then if skybox_defs[biome_name].sky_parameters then
player:set_sky(skybox_defs[biome_name].sky_parameters) if player then
player:set_sky(skybox_defs[biome_name].sky_parameters)
end
else else
player:set_sky() if player then
player:set_sky()
end
end end
if skybox_defs[biome_name].cloud_parameters then if skybox_defs[biome_name].cloud_parameters then
player:set_clouds(skybox_defs[biome_name].cloud_parameters) if player then
player:set_clouds(skybox_defs[biome_name].cloud_parameters)
end
else else
player:set_clouds() if player then
player:set_clouds()
end
end end
if skybox_defs[biome_name].star_parameters then if skybox_defs[biome_name].star_parameters then
player:set_stars(skybox_defs[biome_name].star_parameters) if player then
player:set_stars(skybox_defs[biome_name].star_parameters)
end
else else
player:set_stars() if player then
player:set_stars()
end
end end
else else
player:set_moon() if player then
player:set_sun() player:set_moon()
player:set_sky() end
player:set_clouds() if player then
player:set_stars() player:set_sun()
end
if player then
player:set_sky()
end
if player then
player:set_clouds()
end
if player then
player:set_stars()
end
end end
end end
@ -802,35 +834,46 @@ minetest.register_globalstep(function(dtime)
-- hide sun, moon, stars ... underground -- hide sun, moon, stars ... underground
player_meta:set_int('everness_is_underground', 1) player_meta:set_int('everness_is_underground', 1)
player:set_sun({ if player then
visible = false, player:set_sun({
sunrise_visible = false visible = false,
}) sunrise_visible = false
})
end
player:set_moon({ if player then
visible = false player:set_moon({
}) visible = false
})
player:set_stars({ end
visible = false
})
if player then
player:set_stars({
visible = false
})
end
elseif player_pos.y > -256 and is_underground ~= 0 or (is_underground == 0 and player_biome_name ~= biome_name) then elseif player_pos.y > -256 and is_underground ~= 0 or (is_underground == 0 and player_biome_name ~= biome_name) then
-- show sun, moon, stars ... underground -- show sun, moon, stars ... underground
player_meta:set_int('everness_is_underground', 0) player_meta:set_int('everness_is_underground', 0)
player:set_sun({ if player then
visible = true player:set_sun({
}) visible = true
})
end
player:set_moon({ if player then
visible = true player:set_moon({
}) visible = true
})
end
player:set_stars({ if player then
visible = true, player:set_stars({
sunrise_visible = true visible = true,
}) sunrise_visible = true
})
end
end end
end end