Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Don't show bed msg if player respawns w/o bed

objects
Wuzzy 2019-02-07 19:54:12 +01:00
parent cfdcd63f3c
commit 5897d07435
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mods/PLAYER/mcl_spawn/init.lua
View File

@ -2,21 +2,26 @@ mcl_spawn = {}
-- Returns current spawn position of player. -- Returns current spawn position of player.
-- If player is nil or not a player, the default spawn point is returned. -- If player is nil or not a player, the default spawn point is returned.
-- The second return value is true if spawn point is player-chosen,
-- false otherwise.
mcl_spawn.get_spawn_pos = function(player) mcl_spawn.get_spawn_pos = function(player)
local spawn local spawn, custom_spawn
if player ~= nil and player:is_player() then if player ~= nil and player:is_player() then
spawn = minetest.string_to_pos(player:get_attribute("mcl_beds:spawn")) spawn = minetest.string_to_pos(player:get_attribute("mcl_beds:spawn"))
custom_spawn = true
end end
if not spawn or spawn == "" then if not spawn or spawn == "" then
spawn = minetest.setting_get_pos("static_spawnpoint") spawn = minetest.setting_get_pos("static_spawnpoint")
custom_spawn = false
end end
if not spawn then if not spawn then
spawn = { x=0, y=0, z=0 } spawn = { x=0, y=0, z=0 }
if mg_name == "flat" then if mg_name == "flat" then
spawn.y = mcl_vars.mg_bedrock_overworld_max + 5 spawn.y = mcl_vars.mg_bedrock_overworld_max + 5
end end
custom_spawn = false
end end
return spawn return spawn, custom_spawn
end end
-- Sets the player's spawn position to pos. -- Sets the player's spawn position to pos.
@ -31,8 +36,8 @@ end
-- Respawn player at specified respawn position -- Respawn player at specified respawn position
minetest.register_on_respawnplayer(function(player) minetest.register_on_respawnplayer(function(player)
local pos = mcl_spawn.get_spawn_pos(player) local pos, custom_spawn = mcl_spawn.get_spawn_pos(player)
if pos then if custom_spawn then
-- Check if bed is still there -- Check if bed is still there
-- and the spawning position is free of solid or damaging blocks. -- and the spawning position is free of solid or damaging blocks.
local node_bed = minetest.get_node(pos) local node_bed = minetest.get_node(pos)