Yessiest
/
minetest_game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

beds: Various bug fixes (#2566) 

· Fixes players sleeping in an occupied bed (Wuzzys code)
· Fixes 'sleepwalking' by checking players velocity (Wuzzys code)
· Fixes sleeping player flying off the bed when damaged and flying far away from the bed after death
· Fixes sleeping player being immobilized and bed undiggable after death
This commit is contained in:
An0n3m0us 2020-09-02 17:32:06 +01:00 committed by GitHub
parent 25bf3fdc9c
commit 268f869e67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mods/beds/functions.lua
View File

@ -81,6 +81,21 @@ local function lay_down(player, pos, bed_pos, state, skip)
-- lay down
else
-- Check if bed is occupied
for _, other_pos in pairs(beds.bed_position) do
if vector.distance(bed_pos, other_pos) < 0.1 then
minetest.chat_send_player(name, S("This bed is already occupied!"))
return false
end
end
-- Check if player is moving
if vector.length(player:get_player_velocity()) > 0.001 then
minetest.chat_send_player(name, S("You have to stop moving before going to bed!"))
return false
end
beds.pos[name] = pos
beds.bed_position[name] = bed_pos
beds.player[name] = 1
@ -230,6 +245,19 @@ minetest.register_on_leaveplayer(function(player)
end
end)
minetest.register_on_dieplayer(function(player)
local name = player:get_player_name()
local in_bed = beds.player
local pos = player:get_pos()
local yaw = get_look_yaw(pos)
if in_bed[name] then
lay_down(player, nil, pos, false)
player:set_look_horizontal(yaw)
player:set_pos(pos)
end
end)
minetest.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= "beds_form" then
return
@ -256,3 +284,4 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
end
end)