X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fscript%2Fcpp_api%2Fs_env.cpp;h=af68f689f9f67552e1e63b4b3bdd91d73f6722d7;hb=ec9f1575121e3b064b919bca7efddfa8b0fc4e65;hp=8da5debaa954c1352f1cbb066de7ffd7bbe611aa;hpb=de73f989eb1397b1103236031fd91309b294583c;p=minetest.git

diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
index 8da5debaa..af68f689f 100644
--- a/src/script/cpp_api/s_env.cpp
+++ b/src/script/cpp_api/s_env.cpp
@@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen/mapgen.h"
 #include "lua_api/l_env.h"
 #include "server.h"
+#include "script/common/c_content.h"
+
 
 void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp,
 	u32 blockseed)
@@ -51,13 +53,7 @@ void ScriptApiEnv::environment_Step(float dtime)
 	lua_getfield(L, -1, "registered_globalsteps");
 	// Call callbacks
 	lua_pushnumber(L, dtime);
-	try {
-		runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
-	} catch (LuaError &e) {
-		getServer()->setAsyncFatalError(
-				std::string("environment_Step: ") + e.what() + "\n"
-				+ script_get_backtrace(L));
-	}
+	runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
 }
 
 void ScriptApiEnv::player_event(ServerActiveObject *player, const std::string &type)
@@ -74,13 +70,7 @@ void ScriptApiEnv::player_event(ServerActiveObject *player, const std::string &t
 	// Call callbacks
 	objectrefGetOrCreate(L, player);   // player
 	lua_pushstring(L,type.c_str()); // event type
-	try {
-		runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
-	} catch (LuaError &e) {
-		getServer()->setAsyncFatalError(
-				std::string("player_event: ") + e.what() + "\n"
-				+ script_get_backtrace(L) );
-	}
+	runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
 }
 
 void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
@@ -151,12 +141,18 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
 		bool simple_catch_up = true;
 		getboolfield(L, current_abm, "catch_up", simple_catch_up);
 
+		s16 min_y = INT16_MIN;
+		getintfield(L, current_abm, "min_y", min_y);
+
+		s16 max_y = INT16_MAX;
+		getintfield(L, current_abm, "max_y", max_y);
+
 		lua_getfield(L, current_abm, "action");
 		luaL_checktype(L, current_abm + 1, LUA_TFUNCTION);
 		lua_pop(L, 1);
 
 		LuaABM *abm = new LuaABM(L, id, trigger_contents, required_neighbors,
-			trigger_interval, trigger_chance, simple_catch_up);
+			trigger_interval, trigger_chance, simple_catch_up, min_y, max_y);
 
 		env->addActiveBlockModifier(abm);
 
@@ -249,9 +245,8 @@ void ScriptApiEnv::on_emerge_area_completion(
 	try {
 		PCALL_RES(lua_pcall(L, 4, 0, error_handler));
 	} catch (LuaError &e) {
-		server->setAsyncFatalError(
-				std::string("on_emerge_area_completion: ") + e.what() + "\n"
-				+ script_get_backtrace(L));
+		// Note: don't throw here, we still need to run the cleanup code below
+		server->setAsyncFatalError(e);
 	}
 
 	lua_pop(L, 1); // Pop error handler
@@ -261,3 +256,35 @@ void ScriptApiEnv::on_emerge_area_completion(
 		luaL_unref(L, LUA_REGISTRYINDEX, state->args_ref);
 	}
 }
+
+void ScriptApiEnv::on_liquid_transformed(
+	const std::vector<std::pair<v3s16, MapNode>> &list)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get core.registered_on_liquid_transformed
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_liquid_transformed");
+	luaL_checktype(L, -1, LUA_TTABLE);
+	lua_remove(L, -2);
+
+	// Skip converting list and calling hook if there are
+	// no registered callbacks.
+	if(lua_objlen(L, -1) < 1) return;
+
+	// Convert the list to a pos array and a node array for lua
+	int index = 1;
+	const NodeDefManager *ndef = getEnv()->getGameDef()->ndef();
+	lua_createtable(L, list.size(), 0);
+	lua_createtable(L, list.size(), 0);
+	for(std::pair<v3s16, MapNode> p : list) {
+		lua_pushnumber(L, index);
+		push_v3s16(L, p.first);
+		lua_rawset(L, -4);
+		lua_pushnumber(L, index++);
+		pushnode(L, p.second, ndef);
+		lua_rawset(L, -3);
+	}
+
+	runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
+}