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

Merge branch 'master' into damage

Browse source
This commit is contained in:
Elias Fleckenstein 2021-04-25 17:32:24 +02:00
commit cab2167520
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mods/ITEMS/mcl_beds/functions.lua
View file

@ -6,6 +6,8 @@ local player_in_bed = 0
local is_sp = minetest.is_singleplayer() local is_sp = minetest.is_singleplayer()
local weather_mod = minetest.get_modpath("mcl_weather") ~= nil local weather_mod = minetest.get_modpath("mcl_weather") ~= nil
local explosions_mod = minetest.get_modpath("mcl_explosions") ~= nil local explosions_mod = minetest.get_modpath("mcl_explosions") ~= nil
local spawn_mod = minetest.get_modpath("mcl_spawn")
local worlds_mod = minetest.get_modpath("mcl_worlds")
-- Helper functions -- Helper functions
@ -76,7 +78,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
bed_center = {x = bed_pos.x - dir.x/2, y = bed_pos.y + 0.1, z = bed_pos.z - dir.z/2} bed_center = {x = bed_pos.x - dir.x/2, y = bed_pos.y + 0.1, z = bed_pos.z - dir.z/2}
-- save respawn position when entering bed -- save respawn position when entering bed
if minetest.get_modpath("mcl_spawn") and mcl_spawn.set_spawn_pos(player, bed_pos, false) then if spawn_mod and mcl_spawn.set_spawn_pos(player, bed_pos, nil) then
minetest.chat_send_player(name, S("New respawn position set!")) minetest.chat_send_player(name, S("New respawn position set!"))
end end
@ -297,7 +299,7 @@ function mcl_beds.on_rightclick(pos, player, is_top)
if player:get_meta():get_string("mcl_beds:sleeping") == "true" then if player:get_meta():get_string("mcl_beds:sleeping") == "true" then
return return
end end
if minetest.get_modpath("mcl_worlds") then if worlds_mod then
local dim = mcl_worlds.pos_to_dimension(pos) local dim = mcl_worlds.pos_to_dimension(pos)
if dim == "nether" or dim == "end" then if dim == "nether" or dim == "end" then
-- Bed goes BOOM in the Nether or End. -- Bed goes BOOM in the Nether or End.

4
mods/PLAYER/mcl_spawn/init.lua
View file

@ -397,9 +397,9 @@ end
-- false otherwise. -- false otherwise.
mcl_spawn.get_bed_spawn_pos = function(player) mcl_spawn.get_bed_spawn_pos = function(player)
local spawn, custom_spawn = nil, false local spawn, custom_spawn = nil, false
if player ~= nil and player:is_player() then if player and player:is_player() then
local attr = player:get_meta():get_string("mcl_beds:spawn") local attr = player:get_meta():get_string("mcl_beds:spawn")
if attr ~= nil and attr ~= "" then if attr and attr ~= "" then
spawn = minetest.string_to_pos(attr) spawn = minetest.string_to_pos(attr)
custom_spawn = true custom_spawn = true
end end