From 9e100bc42b5275299020ea8619e64f2e4aa76192 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 27 Jun 2013 22:33:31 -0400 Subject: Apply various fixes to several things --- src/script/lua_api/l_env.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/script/lua_api/l_env.cpp') diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index 02cafc0d5..89ba9798a 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -579,6 +579,8 @@ int ModApiEnvMod::l_get_mapgen_object(lua_State *L) EmergeManager *emerge = getServer(L)->getEmergeManager(); Mapgen *mg = emerge->getCurrentMapgen(); + if (!mg) + return 0; size_t maplen = mg->csize.X * mg->csize.Z; @@ -614,7 +616,7 @@ int ModApiEnvMod::l_get_mapgen_object(lua_State *L) } break; } case MGOBJ_BIOMEMAP: { - if (!mg->heightmap) + if (!mg->biomemap) return 0; lua_newtable(L); @@ -625,6 +627,9 @@ int ModApiEnvMod::l_get_mapgen_object(lua_State *L) break; } case MGOBJ_HEATMAP: { // Mapgen V7 specific objects case MGOBJ_HUMIDMAP: + if (strcmp(emerge->params->mg_name.c_str(), "v7")) + return 0; + MapgenV7 *mgv7 = (MapgenV7 *)mg; float *arr = (mgobj == MGOBJ_HEATMAP) ? -- cgit v1.2.3