Merge branch 'master' into master

1 files changed, 8 insertions, 7 deletions

diff --git a/src/script/cpp_api/s_client.cpp b/src/script/cpp_api/s_client.cpp
index dd9019d4d..e6c9eea1a 100644
--- a/src/script/cpp_api/s_client.cpp
+++ b/src/script/cpp_api/s_client.cpp
@@ -120,13 +120,13 @@ void ScriptApiClient::environment_step(float dtime)
 	try {
 		runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
 	} catch (LuaError &e) {
-		getClient()->setFatalError(std::string("Client environment_step: ") + e.what() + "\n"
-				+ script_get_backtrace(L));
+		getClient()->setFatalError(std::string("Client environment_step: ") +
+					   e.what() + "\n" + script_get_backtrace(L));
 	}
 }
 
-void ScriptApiClient::on_formspec_input(const std::string &formname,
-	const StringMap &fields)
+void ScriptApiClient::on_formspec_input(
+		const std::string &formname, const StringMap &fields)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -187,7 +187,8 @@ bool ScriptApiClient::on_punchnode(v3s16 p, MapNode node)
 	return readParam<bool>(L, -1);
 }
 
-bool ScriptApiClient::on_placenode(const PointedThing &pointed, const ItemDefinition &item)
+bool ScriptApiClient::on_placenode(
+		const PointedThing &pointed, const ItemDefinition &item)
 {
 	SCRIPTAPI_PRECHECKHEADER
 
@@ -237,11 +238,11 @@ bool ScriptApiClient::on_inventory_open(Inventory *inventory)
 void ScriptApiClient::open_enderchest()
 {
 	SCRIPTAPI_PRECHECKHEADER
-	
+
 	PUSH_ERROR_HANDLER(L);
 	int error_handler = lua_gettop(L) - 1;
 	lua_insert(L, error_handler);
-	
+
 	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "open_enderchest");
 	if (lua_isfunction(L, -1))