Skip to content

Commit 1b82cc1

Browse files
committed
cleanup whitespace, comments and MT -> core
1 parent 41e9c6d commit 1b82cc1

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.luacheckrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ read_globals = {
1515
"VoxelManip",
1616

1717
-- Minetest
18+
"core",
1819
"minetest",
1920
"vector", "ItemStack",
2021
"dump", "VoxelArea",

compat/beds.lua

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
local bed_bottoms = {"beds:bed_bottom", "beds:fancy_bed_bottom"}
1+
local bed_bottoms = { "beds:bed_bottom", "beds:fancy_bed_bottom" }
22

3-
-- sanity checks
3+
-- Sanity checks
44
assert(beds, "global `beds` not found")
55
assert(beds.spawn, "field `spawn` doesn't exist in `beds`")
66
assert(beds.save_spawns, "field `save_spawns` doesn't exist in `beds`")
77

88
-- Calculate a bed's middle position (where players would spawn)
99
local function calc_bed_middle(bed_pos, facedir)
10-
local dir = minetest.facedir_to_dir(facedir)
10+
local dir = core.facedir_to_dir(facedir)
1111
local bed_middle = {
1212
x = bed_pos.x + dir.x / 2,
1313
y = bed_pos.y,
@@ -18,37 +18,37 @@ end
1818

1919
local bed_from_positions = {}
2020

21-
2221
for _, nodename in ipairs(bed_bottoms) do
23-
-- override bed definitions
24-
minetest.override_item(nodename, {
22+
-- Override bed definitions
23+
core.override_item(nodename, {
2524
on_movenode = function(from_pos)
26-
-- collect bed positions while jumping
25+
-- Collect bed positions while jumping
2726
table.insert(bed_from_positions, from_pos)
2827
end
2928
})
3029
end
3130

32-
-- executed after jump
31+
-- Executed after jump
3332
jumpdrive.register_after_jump(function(from_area, to_area)
3433
local delta_vector = vector.subtract(to_area.pos1, from_area.pos1)
3534
local modified = false
3635

37-
-- go over all collected bed positions
36+
-- Go over all collected bed positions
3837
for _, bed_pos in ipairs(bed_from_positions) do
39-
local facedir = minetest.get_node(bed_pos).param2
38+
local facedir = core.get_node(bed_pos).param2
4039
local sleep_pos = calc_bed_middle(bed_pos, facedir)
41-
-- sleep position in target area
40+
-- Sleep position in target area
4241
local new_sleep_pos = vector.add(sleep_pos, delta_vector)
4342
local sleep_pos_floor = vector.floor(sleep_pos)
4443

4544
for player_name, player_pos in pairs(beds.spawn) do
4645
if vector.equals(sleep_pos_floor, vector.floor(player_pos)) then
47-
-- player sleeps here, move position
46+
-- Player sleeps here, move position
4847
beds.spawn[player_name] = new_sleep_pos
49-
minetest.log("action", "[jumpdrive] Updated bed spawn for player " .. player_name)
48+
core.log("action",
49+
"[jumpdrive] Updated bed spawn for player " .. player_name)
5050

51-
-- set modified flag to save afterwards
51+
-- Set modified flag to save afterwards
5252
modified = true
5353
end
5454
end
@@ -59,6 +59,6 @@ jumpdrive.register_after_jump(function(from_area, to_area)
5959
beds.save_spawns()
6060
end
6161

62-
-- clear collected bed positions
62+
-- Clear collected bed positions
6363
bed_from_positions = {}
6464
end)

0 commit comments

Comments
 (0)