teknomunk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Use new player attribute API for bed spawns

This commit is contained in:
Wuzzy 2017-06-06 19:05:28 +02:00
parent 9f683542af
commit b6ee94f9b2
3 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mods/ITEMS/mcl_beds/functions.lua
View File

@ -149,7 +149,7 @@ function mcl_beds.on_rightclick(pos, player)
-- move to bed -- move to bed
if not mcl_beds.player[name] then if not mcl_beds.player[name] then
lay_down(player, ppos, pos) lay_down(player, ppos, pos)
mcl_beds.set_spawns() -- save respawn positions when entering bed player:set_attribute("mcl_beds:spawn", minetest.pos_to_string(player:getpos())) -- save respawn position when entering bed
else else
lay_down(player, nil, nil, false) lay_down(player, nil, nil, false)
end end
@ -178,8 +178,7 @@ end
if enable_respawn then if enable_respawn then
-- respawn player at bed if enabled and valid position is found -- respawn player at bed if enabled and valid position is found
minetest.register_on_respawnplayer(function(player) minetest.register_on_respawnplayer(function(player)
local name = player:get_player_name() local pos = minetest.string_to_pos(player:get_attribute("mcl_beds:spawn"))
local pos = mcl_beds.spawn[name]
if pos then if pos then
player:setpos(pos) player:setpos(pos)
return true return true

2
mods/ITEMS/mcl_beds/init.lua
View File

@ -1,7 +1,6 @@
mcl_beds = {} mcl_beds = {}
mcl_beds.player = {} mcl_beds.player = {}
mcl_beds.pos = {} mcl_beds.pos = {}
mcl_beds.spawn = {}
mcl_beds.formspec = "size[8,15;true]" .. mcl_beds.formspec = "size[8,15;true]" ..
"bgcolor[#080808BB; true]" .. "bgcolor[#080808BB; true]" ..
@ -14,4 +13,3 @@ local modpath = minetest.get_modpath("mcl_beds")
dofile(modpath .. "/functions.lua") dofile(modpath .. "/functions.lua")
dofile(modpath .. "/api.lua") dofile(modpath .. "/api.lua")
dofile(modpath .. "/beds.lua") dofile(modpath .. "/beds.lua")
dofile(modpath .. "/spawns.lua")

63
mods/ITEMS/mcl_beds/spawns.lua
View File

@ -1,63 +0,0 @@
local world_path = minetest.get_worldpath()
local org_file = world_path .. "/beds_spawns"
local file = world_path .. "/beds_spawns"
local bkwd = false
-- check for PA's beds mod spawns
local cf = io.open(world_path .. "/beds_player_spawns", "r")
if cf ~= nil then
io.close(cf)
file = world_path .. "/beds_player_spawns"
bkwd = true
end
function mcl_beds.save_spawns()
if not mcl_beds.spawn then
return
end
local data = {}
local output = io.open(org_file, "w")
for k, v in pairs(mcl_beds.spawn) do
table.insert(data, string.format("%.1f %.1f %.1f %s\n", v.x, v.y, v.z, k))
end
output:write(table.concat(data))
io.close(output)
end
function mcl_beds.read_spawns()
local spawns = mcl_beds.spawn
local input = io.open(file, "r")
if input and not bkwd then
repeat
local x = input:read("*n")
if x == nil then
break
end
local y = input:read("*n")
local z = input:read("*n")
local name = input:read("*l")
spawns[name:sub(2)] = {x = x, y = y, z = z}
until input:read(0) == nil
io.close(input)
elseif input and bkwd then
mcl_beds.spawn = minetest.deserialize(input:read("*all"))
input:close()
mcl_beds.save_spawns()
os.rename(file, file .. ".backup")
file = org_file
end
end
mcl_beds.read_spawns()
function mcl_beds.set_spawns()
for name,_ in pairs(mcl_beds.player) do
local player = minetest.get_player_by_name(name)
local p = player:getpos()
-- but don't change spawn location if borrowing a bed
if not minetest.is_protected(p, name) then
mcl_beds.spawn[name] = p
end
end
mcl_beds.save_spawns()
end