1 files changed, 19 insertions, 16 deletions

diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp
index b52bde18a..0d159846a 100644
--- a/src/script/cpp_api/s_entity.cpp
+++ b/src/script/cpp_api/s_entity.cpp
@@ -91,9 +91,9 @@ void ScriptApiEntity::luaentity_Activate(u16 id,
 		lua_pushvalue(L, object); // self
 		lua_pushlstring(L, staticdata.c_str(), staticdata.size());
 		lua_pushinteger(L, dtime_s);
-		// Call with 3 arguments, 0 results
-		if (lua_pcall(L, 3, 0, m_errorhandler))
-			scriptError();
+
+		setOriginFromTable(object);
+		PCALL_RES(lua_pcall(L, 3, 0, m_errorhandler));
 	} else {
 		lua_pop(L, 1);
 	}
@@ -136,12 +136,12 @@ std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
 		lua_pop(L, 2); // Pop entity and  get_staticdata
 		return "";
 	}
-
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
-	// Call with 1 arguments, 1 results
-	if (lua_pcall(L, 1, 1, m_errorhandler))
-		scriptError();
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 1, 1, m_errorhandler));
+
 	lua_remove(L, object); // Remove object
 
 	size_t len = 0;
@@ -209,9 +209,10 @@ void ScriptApiEntity::luaentity_Step(u16 id, float dtime)
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
 	lua_pushnumber(L, dtime); // dtime
-	// Call with 2 arguments, 0 results
-	if (lua_pcall(L, 2, 0, m_errorhandler))
-		scriptError();
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 2, 0, m_errorhandler));
+
 	lua_pop(L, 1); // Pop object
 }
 
@@ -241,9 +242,10 @@ void ScriptApiEntity::luaentity_Punch(u16 id,
 	lua_pushnumber(L, time_from_last_punch);
 	push_tool_capabilities(L, *toolcap);
 	push_v3f(L, dir);
-	// Call with 5 arguments, 0 results
-	if (lua_pcall(L, 5, 0, m_errorhandler))
-		scriptError();
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 5, 0, m_errorhandler));
+
 	lua_pop(L, 1); // Pop object
 }
 
@@ -268,9 +270,10 @@ void ScriptApiEntity::luaentity_Rightclick(u16 id,
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object); // self
 	objectrefGetOrCreate(L, clicker); // Clicker reference
-	// Call with 2 arguments, 0 results
-	if (lua_pcall(L, 2, 0, m_errorhandler))
-		scriptError();
+
+	setOriginFromTable(object);
+	PCALL_RES(lua_pcall(L, 2, 0, m_errorhandler));
+
 	lua_pop(L, 1); // Pop object
 }