Fix compile on certain Linux configurations, reduce spawn point height

[oweals/minetest.git] / src / scriptapi.cpp

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 56fdef3f9c7803185e81e0b7d19d38c28c1cc0f1..ec3d34676672decfdcca5db0d2a5f9b7665bd7f2 100644 (file)
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -4463,7 +4463,11 @@ static int l_register_biome_groups(lua_State *L)
        if (!lua_istable(L, index))
                throw LuaError(L, "register_biome_groups: parameter is not a table");
 
-       BiomeDefManager *bmgr = get_server(L)->getEmergeManager()->biomedef;
+       BiomeDefManager *bmgr = get_server(L)->getBiomeDef();
+       if (!bmgr) {
+               verbosestream << "register_biome_groups: BiomeDefManager not active" << std::endl;
+               return 0;
+       }
 
        lua_pushnil(L);
        for (int i = 1; lua_next(L, index) != 0; i++) {
@@ -4483,7 +4487,11 @@ static int l_register_biome(lua_State *L)
        std::string nodename;
 
        IWritableNodeDefManager *ndef = get_server(L)->getWritableNodeDefManager();
-       BiomeDefManager *bmgr = get_server(L)->getEmergeManager()->biomedef;
+       BiomeDefManager *bmgr = get_server(L)->getBiomeDef();
+       if (!bmgr) {
+               verbosestream << "register_biome: BiomeDefManager not active" << std::endl;
+               return 0;
+       }
 
        groupid = getintfield_default(L, index, "group_id", 0);