Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
minetest_game
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Illuna-Minetest
minetest_game
Commits
624dafc1
Unverified
Commit
624dafc1
authored
4 years ago
by
Lars Müller
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash on exit of bed formspec if not sleeping (#2826)
parent
3d95fcee
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mods/beds/functions.lua
+11
-5
11 additions, 5 deletions
mods/beds/functions.lua
with
11 additions
and
5 deletions
mods/beds/functions.lua
+
11
−
5
View file @
624dafc1
...
@@ -60,18 +60,19 @@ local function lay_down(player, pos, bed_pos, state, skip)
...
@@ -60,18 +60,19 @@ local function lay_down(player, pos, bed_pos, state, skip)
-- stand up
-- stand up
if
state
~=
nil
and
not
state
then
if
state
~=
nil
and
not
state
then
local
p
=
beds
.
pos
[
name
]
or
nil
if
not
beds
.
player
[
name
]
then
-- player not in bed, do nothing
return
false
end
beds
.
bed_position
[
name
]
=
nil
beds
.
bed_position
[
name
]
=
nil
-- 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
end
end
if
p
then
player
:
set_pos
(
beds
.
pos
[
name
])
player
:
set_pos
(
p
)
end
-- physics, eye_offset, etc
-- physics, eye_offset, etc
local
physics_override
=
assert
(
beds
.
player
[
name
].
physics_override
)
local
physics_override
=
beds
.
player
[
name
].
physics_override
beds
.
player
[
name
]
=
nil
beds
.
player
[
name
]
=
nil
player
:
set_physics_override
({
player
:
set_physics_override
({
speed
=
physics_override
.
speed
,
speed
=
physics_override
.
speed
,
...
@@ -101,6 +102,11 @@ local function lay_down(player, pos, bed_pos, state, skip)
...
@@ -101,6 +102,11 @@ local function lay_down(player, pos, bed_pos, state, skip)
return
false
return
false
end
end
if
beds
.
player
[
name
]
then
-- player already in bed, do nothing
return
false
end
beds
.
pos
[
name
]
=
pos
beds
.
pos
[
name
]
=
pos
beds
.
bed_position
[
name
]
=
bed_pos
beds
.
bed_position
[
name
]
=
bed_pos
beds
.
player
[
name
]
=
{
physics_override
=
player
:
get_physics_override
()}
beds
.
player
[
name
]
=
{
physics_override
=
player
:
get_physics_override
()}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment