Mgv6: Fix taiga, allow pine tree spawning on snowblocks

[oweals/minetest.git] / builtin / game / static_spawn.lua

diff --git a/builtin/game/static_spawn.lua b/builtin/game/static_spawn.lua
index e8c107d86a3c364da1f3645ebbfbfb9443aa36e7..492ab6ca6b0a2dabbfbb25eba4150c3fb39b4580 100644 (file)
--- a/builtin/game/static_spawn.lua
+++ b/builtin/game/static_spawn.lua
@@ -1,10 +1,10 @@
 -- Minetest: builtin/static_spawn.lua
 
 local function warn_invalid_static_spawnpoint()
-       if minetest.setting_get("static_spawnpoint") and
-                       not minetest.setting_get_pos("static_spawnpoint") then
-               minetest.log('error', "The static_spawnpoint setting is invalid: \""..
-                               minetest.setting_get("static_spawnpoint").."\"")
+       if core.setting_get("static_spawnpoint") and
+                       not core.setting_get_pos("static_spawnpoint") then
+               core.log('error', "The static_spawnpoint setting is invalid: \""..
+                               core.setting_get("static_spawnpoint").."\"")
        end
 end
 
@@ -12,22 +12,22 @@ warn_invalid_static_spawnpoint()
 
 local function put_player_in_spawn(obj)
        warn_invalid_static_spawnpoint()
-       local static_spawnpoint = minetest.setting_get_pos("static_spawnpoint")
+       local static_spawnpoint = core.setting_get_pos("static_spawnpoint")
        if not static_spawnpoint then
                return false
        end
-       minetest.log('action', "Moving "..obj:get_player_name()..
+       core.log('action', "Moving "..obj:get_player_name()..
                        " to static spawnpoint at "..
-                       minetest.pos_to_string(static_spawnpoint))
+                       core.pos_to_string(static_spawnpoint))
        obj:setpos(static_spawnpoint)
        return true
 end
 
-minetest.register_on_newplayer(function(obj)
+core.register_on_newplayer(function(obj)
        put_player_in_spawn(obj)
 end)
 
-minetest.register_on_respawnplayer(function(obj)
+core.register_on_respawnplayer(function(obj)
        return put_player_in_spawn(obj)
 end)