fix

proller · Nov 23, 2024 · 7d135c4 · 7d135c4
1 parent d43f7f8
commit 7d135c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp
@@ -226,7 +226,7 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id,
 bool ScriptApiEntity::luaentity_Step(u16 id, float dtime,
 	const collisionMoveResult *moveresult)
 {
-	TRY_SCRIPTAPI_PRECHECKHEADER
+	TRY_SCRIPTAPI_PRECHECKHEADER({})
 
 	int error_handler = PUSH_ERROR_HANDLER(L);
 

diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
@@ -139,7 +139,7 @@ void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp,
 
 void ScriptApiEnv::environment_Step(float dtime)
 {
-	TRY_SCRIPTAPI_PRECHECKHEADER
+	TRY_SCRIPTAPI_PRECHECKHEADER()
 
 	// Get core.registered_globalsteps
 	lua_getglobal(L, "core");

diff --git a/src/script/cpp_api/s_internal.h b/src/script/cpp_api/s_internal.h
@@ -70,9 +70,9 @@ class LockChecker {
 	#define SCRIPTAPI_LOCK_CHECK while(0)
 #endif
 
-#define TRY_SCRIPTAPI_PRECHECKHEADER                                           \
+#define TRY_SCRIPTAPI_PRECHECKHEADER(RET)                                           \
 		const std::unique_lock<std::recursive_mutex> scriptlock(this->m_luastackmutex, std::try_to_lock); \
-		if (!scriptlock.owns_lock()) { /* DUMP("skiplock", scriptlock); */ return {}; } \
+		if (!scriptlock.owns_lock()) { /* DUMP("skiplock", scriptlock); */ return RET; } \
 		SCRIPTAPI_LOCK_CHECK;                                                  \
 		realityCheck();                                                        \
 		lua_State *L = getStack();                                             \