Beds can save spawn pos at daytime, too

This commit is contained in:
Wuzzy 2019-02-20 19:22:24 +01:00
parent 0cc8962258
commit ec53db9352
2 changed files with 42 additions and 34 deletions

View File

@ -1,15 +1,13 @@
local reverse = true local reverse = true
local function destruct_bed(pos, n) local function destruct_bed(pos, is_top)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local other local other
if n == 2 then
local dir = minetest.facedir_to_dir(node.param2) local dir = minetest.facedir_to_dir(node.param2)
if is_top then
other = vector.subtract(pos, dir) other = vector.subtract(pos, dir)
elseif n == 1 then else
local dir = minetest.facedir_to_dir(node.param2)
other = vector.add(pos, dir) other = vector.add(pos, dir)
end end
@ -136,12 +134,12 @@ function mcl_beds.register_bed(name, def)
end, end,
on_destruct = function(pos) on_destruct = function(pos)
destruct_bed(pos, 1) destruct_bed(pos, false)
kick_player_after_destruct(pos) kick_player_after_destruct(pos)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
mcl_beds.on_rightclick(pos, clicker) mcl_beds.on_rightclick(pos, clicker, false)
return itemstack return itemstack
end, end,
@ -206,12 +204,12 @@ function mcl_beds.register_bed(name, def)
selection_box = selection_box_top, selection_box = selection_box_top,
collision_box = collision_box_top, collision_box = collision_box_top,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
mcl_beds.on_rightclick(pos, clicker) mcl_beds.on_rightclick(pos, clicker, true)
return itemstack return itemstack
end, end,
on_rotate = false, on_rotate = false,
on_destruct = function(pos) on_destruct = function(pos)
destruct_bed(pos, 2) destruct_bed(pos, true)
kick_player_after_destruct(pos) kick_player_after_destruct(pos)
end, end,
}) })

View File

@ -61,14 +61,14 @@ local function lay_down(player, pos, bed_pos, state, skip)
local hud_flags = player:hud_get_flags() local hud_flags = player:hud_get_flags()
if not player or not name then if not player or not name then
return return false
end end
if bed_pos then if bed_pos then
-- No sleeping if too far away -- No sleeping if too far away
if vector.distance(bed_pos, pos) > 2 then if vector.distance(bed_pos, pos) > 2 then
minetest.chat_send_player(name, "You can't sleep, the bed's too far away!") minetest.chat_send_player(name, "You can't sleep, the bed's too far away!")
return return false
end end
-- No sleeping while moving. This is a workaround. -- No sleeping while moving. This is a workaround.
@ -76,7 +76,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
-- but this is not possible in Minetest 0.4.17. -- but this is not possible in Minetest 0.4.17.
if vector.length(player:get_player_velocity()) > 0.001 then if vector.length(player:get_player_velocity()) > 0.001 then
minetest.chat_send_player(name, "You have to stop moving before going to bed!") minetest.chat_send_player(name, "You have to stop moving before going to bed!")
return return false
end end
-- No sleeping if monsters nearby. -- No sleeping if monsters nearby.
@ -93,7 +93,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
if math.abs(bed_pos.y - obj:get_pos().y) <= 5 then if math.abs(bed_pos.y - obj:get_pos().y) <= 5 then
minetest.chat_send_player(name, "You can't sleep now, monsters are nearby!") minetest.chat_send_player(name, "You can't sleep now, monsters are nearby!")
end end
return return false
end end
end end
end end
@ -108,7 +108,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
end end
-- skip here to prevent sending player specific changes (used for leaving players) -- skip here to prevent sending player specific changes (used for leaving players)
if skip then if skip then
return return false
end end
if p then if p then
player:setpos(p) player:setpos(p)
@ -116,7 +116,9 @@ local function lay_down(player, pos, bed_pos, state, skip)
-- physics, eye_offset, etc -- physics, eye_offset, etc
player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0}) player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
player:set_look_horizontal(math.random(1, 180) / 100) if player:get_look_vertical() > 0 then
player:set_look_vertical(0)
end
mcl_player.player_attached[name] = false mcl_player.player_attached[name] = false
playerphysics.remove_physics_factor(player, "speed", "mcl_beds:sleeping") playerphysics.remove_physics_factor(player, "speed", "mcl_beds:sleeping")
playerphysics.remove_physics_factor(player, "jump", "mcl_beds:sleeping") playerphysics.remove_physics_factor(player, "jump", "mcl_beds:sleeping")
@ -135,10 +137,24 @@ local function lay_down(player, pos, bed_pos, state, skip)
local def2 = minetest.registered_nodes[n2.name] local def2 = minetest.registered_nodes[n2.name]
if def1.walkable or def2.walkable then if def1.walkable or def2.walkable then
minetest.chat_send_player(name, "You can't sleep, the bed is obstructed!") minetest.chat_send_player(name, "You can't sleep, the bed is obstructed!")
return return false
elseif (def1.damage_per_second ~= nil and def1.damage_per_second > 0) or (def2.damage_per_second ~= nil and def2.damage_per_second > 0) then elseif (def1.damage_per_second ~= nil and def1.damage_per_second > 0) or (def2.damage_per_second ~= nil and def2.damage_per_second > 0) then
minetest.chat_send_player(name, "It's too dangerous to sleep here!") minetest.chat_send_player(name, "It's too dangerous to sleep here!")
return return false
end
if minetest.get_modpath("mcl_spawn") then
local spos = table.copy(bed_pos)
spos.y = spos.y + 0.1
mcl_spawn.set_spawn_pos(player, spos) -- save respawn position when entering bed
end
-- Check day of time and weather
local tod = minetest.get_timeofday() * 24000
-- Values taken from Minecraft Wiki with offset of +6000
if tod < 18541 and tod > 5458 and (not weather_mod or (mcl_weather.get_weather() ~= "thunder")) then
minetest.chat_send_player(name, "You can only sleep at night or during a thunderstorm.")
return false
end end
mcl_beds.player[name] = 1 mcl_beds.player[name] = 1
@ -147,6 +163,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
-- physics, eye_offset, etc -- physics, eye_offset, etc
player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0}) player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
player:set_look_horizontal(yaw) player:set_look_horizontal(yaw)
player:set_look_vertical(0)
player:set_attribute("mcl_beds:sleeping", "true") player:set_attribute("mcl_beds:sleeping", "true")
playerphysics.add_physics_factor(player, "speed", "mcl_beds:sleeping", 0) playerphysics.add_physics_factor(player, "speed", "mcl_beds:sleeping", 0)
@ -158,6 +175,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
end end
player:hud_set_flags(hud_flags) player:hud_set_flags(hud_flags)
return true
end end
local function update_formspecs(finished) local function update_formspecs(finished)
@ -260,7 +278,7 @@ function mcl_beds.skip_thunderstorm()
return false return false
end end
function mcl_beds.on_rightclick(pos, player) function mcl_beds.on_rightclick(pos, player, is_top)
-- Anti-Inception: Don't allow to sleep while you're sleeping -- Anti-Inception: Don't allow to sleep while you're sleeping
if player:get_attribute("mcl_beds:sleeping") == "true" then if player:get_attribute("mcl_beds:sleeping") == "true" then
return return
@ -278,24 +296,16 @@ function mcl_beds.on_rightclick(pos, player)
end end
local name = player:get_player_name() local name = player:get_player_name()
local ppos = player:get_pos() local ppos = player:get_pos()
local tod = minetest.get_timeofday() * 24000
-- Values taken from Minecraft Wiki with offset of +6000
if tod < 18541 and tod > 5458 and (not weather_mod or (mcl_weather.get_weather() ~= "thunder")) then
if mcl_beds.player[name] then
lay_down(player, nil, nil, false)
end
minetest.chat_send_player(name, "You can only sleep at night or during a thunderstorm.")
return
end
-- move to bed -- move to bed
if not mcl_beds.player[name] then if not mcl_beds.player[name] then
if is_top then
lay_down(player, ppos, pos) lay_down(player, ppos, pos)
if minetest.get_modpath("mcl_spawn") then else
local spos = table.copy(pos) local node = minetest.get_node(pos)
spos.y = spos.y + 0.1 local dir = minetest.facedir_to_dir(node.param2)
mcl_spawn.set_spawn_pos(player, spos) -- save respawn position when entering bed local other = vector.add(pos, dir)
lay_down(player, ppos, other)
end end
else else
lay_down(player, nil, nil, false) lay_down(player, nil, nil, false)