minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Abort if static_spawnpoint is an invalid setting instead of just giving an error log

This commit is contained in:
Hybrid Dog 2017-08-12 12:11:28 +02:00 committed by rubenwardy
parent 3aab517775
commit 7e23532bc2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/game/static_spawn.lua
View File

@ -1,15 +1,13 @@
-- Minetest: builtin/static_spawn.lua -- Minetest: builtin/static_spawn.lua
local function warn_invalid_static_spawnpoint() local static_spawnpoint_string = core.settings:get("static_spawnpoint")
if core.settings:get("static_spawnpoint") and if static_spawnpoint_string and
not core.setting_get_pos("static_spawnpoint") then static_spawnpoint_string ~= "" and
core.log("error", "The static_spawnpoint setting is invalid: \"".. not core.setting_get_pos("static_spawnpoint") then
core.settings:get("static_spawnpoint").."\"") error('The static_spawnpoint setting is invalid: "' ..
end static_spawnpoint_string .. '"')
end end
warn_invalid_static_spawnpoint()
local function put_player_in_spawn(player_obj) local function put_player_in_spawn(player_obj)
local static_spawnpoint = core.setting_get_pos("static_spawnpoint") local static_spawnpoint = core.setting_get_pos("static_spawnpoint")
if not static_spawnpoint then if not static_spawnpoint then