Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-22 18:41:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Resolve the void / weather sky color conflict

Browse source
This commit is contained in:
Wuzzy 2017-02-21 13:48:20 +01:00
parent edde01d582
commit 5a6fd4f39f
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mods/ENVIRONMENT/weather_pack/depends.txt
View file

@ -1 +1,2 @@
mcl_init
lightning?

22
mods/ENVIRONMENT/weather_pack/skycolor.lua
View file

@ -74,7 +74,10 @@ skycolor = {
players = skycolor.utils.get_players(players)
for _, player in ipairs(players) do
player:set_sky(color, "plain", nil)
local pos = player:getpos()
if pos.y >= mcl_vars.bedrock_overworld_max then
player:set_sky(color, "plain", nil)
end
end
end,
@ -110,7 +113,10 @@ skycolor = {
local players = skycolor.utils.get_players(nil)
for _, player in ipairs(players) do
player:set_sky(color, "plain", nil)
local pos = player:getpos()
if pos.y >= mcl_vars.bedrock_overworld_max then
player:set_sky(color, "plain", nil)
end
end
end,
@ -120,7 +126,10 @@ skycolor = {
set_default_sky = function(players)
local players = skycolor.utils.get_players(players)
for _, player in ipairs(players) do
player:set_sky(nil, "regular", nil)
local pos = player:getpos()
if pos.y >= mcl_vars.bedrock_overworld_max then
player:set_sky(nil, "regular", nil)
end
end
end,
@ -205,8 +214,11 @@ minetest.register_globalstep(function(dtime)
end)
minetest.register_on_joinplayer(function(player)
local initsky = function(player)
if (skycolor.active) then
skycolor.update_sky_color({player})
end
end)
end
minetest.register_on_joinplayer(initsky)
minetest.register_on_respawnplayer(initsky)

8
mods/PLAYER/playerplus/init.lua
View file

@ -122,15 +122,13 @@ minetest.register_globalstep(function(dtime)
end
-- Apply black sky in the Void and deal Void damage
--[[ DISABLED because of conflicts with weater_pack.
TODO: The sky color handling needs a major rework.
if pos.y < mcl_vars.bedrock_overworld_max then
-- Player reached the void, set black sky box
player:set_sky("#000000", "plain")
else
player:set_sky(nil, "regular")
-- 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.
end
]]
if pos.y < mcl_vars.bedrock_overworld_min - 65 then
-- Player is deep into the void, deal void damage
if player:get_hp() > 0 then