Merge branch 'master' into master

1 files changed, 19 insertions, 19 deletions

diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index 05bfcca52..44311be68 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -38,11 +38,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "client/keycode.h"
 
-#define checkCSMRestrictionFlag(flag) \
-	( getClient(L)->checkCSMRestrictionFlag(CSMRestrictionFlags::flag) )
+#define checkCSMRestrictionFlag(flag)                                                    \
+	(getClient(L)->checkCSMRestrictionFlag(CSMRestrictionFlags::flag))
 
 // Not the same as FlagDesc, which contains an `u32 flag`
-struct CSMFlagDesc {
+struct CSMFlagDesc
+{
 	const char *name;
 	u64 flag;
 };
@@ -53,14 +54,12 @@ struct CSMFlagDesc {
 	in network/networkprotocol.h
 */
 const static CSMFlagDesc flagdesc_csm_restriction[] = {
-	{"load_client_mods",  CSM_RF_LOAD_CLIENT_MODS},
-	{"chat_messages",     CSM_RF_CHAT_MESSAGES},
-	{"read_itemdefs",     CSM_RF_READ_ITEMDEFS},
-	{"read_nodedefs",     CSM_RF_READ_NODEDEFS},
-	{"lookup_nodes",      CSM_RF_LOOKUP_NODES},
-	{"read_playerinfo",   CSM_RF_READ_PLAYERINFO},
-	{NULL,      0}
-};
+		{"load_client_mods", CSM_RF_LOAD_CLIENT_MODS},
+		{"chat_messages", CSM_RF_CHAT_MESSAGES},
+		{"read_itemdefs", CSM_RF_READ_ITEMDEFS},
+		{"read_nodedefs", CSM_RF_READ_NODEDEFS},
+		{"lookup_nodes", CSM_RF_LOOKUP_NODES},
+		{"read_playerinfo", CSM_RF_READ_PLAYERINFO}, {NULL, 0}};
 
 // get_current_modname()
 int ModApiClient::l_get_current_modname(lua_State *L)
@@ -422,7 +421,7 @@ int ModApiClient::l_send_damage(lua_State *L)
 {
 	u16 damage = luaL_checknumber(L, 1);
 	getClient(L)->sendDamage(damage);
-	return 0;	
+	return 0;
 }
 
 // place_node(pos)
@@ -433,7 +432,8 @@ int ModApiClient::l_place_node(lua_State *L)
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
 	ItemStack selected_item, hand_item;
 	player->getWieldedItem(&selected_item, &hand_item);
-	const ItemDefinition &selected_def = selected_item.getDefinition(getGameDef(L)->idef());
+	const ItemDefinition &selected_def =
+			selected_item.getDefinition(getGameDef(L)->idef());
 	v3s16 pos = read_v3s16(L, 1);
 	PointedThing pointed;
 	pointed.type = POINTEDTHING_NODE;
@@ -465,7 +465,7 @@ int ModApiClient::l_get_inventory(lua_State *L)
 	InventoryLocation inventory_location;
 	Inventory *inventory;
 	std::string location;
-	
+
 	location = readParam<std::string>(L, 1);
 
 	try {
@@ -475,7 +475,7 @@ int ModApiClient::l_get_inventory(lua_State *L)
 	} catch (SerializationError &) {
 		lua_pushnil(L);
 	}
-	
+
 	return 1;
 }
 
@@ -508,17 +508,17 @@ int ModApiClient::l_drop_selected_item(lua_State *L)
 int ModApiClient::l_get_objects_inside_radius(lua_State *L)
 {
 	ClientEnvironment &env = getClient(L)->getEnv();
-	
+
 	v3f pos = checkFloatPos(L, 1);
 	float radius = readParam<float>(L, 2) * BS;
-	
+
 	std::vector<DistanceSortedActiveObject> objs;
 	env.getActiveObjects(pos, radius, objs);
-	
+
 	int i = 0;
 	lua_createtable(L, objs.size(), 0);
 	for (const auto obj : objs) {
-		ClientObjectRef::create(L, obj.obj);							// TODO: getObjectRefOrCreate
+		ClientObjectRef::create(L, obj.obj); // TODO: getObjectRefOrCreate
 		lua_rawseti(L, -2, ++i);
 	}
 	return 1;