Merge branch 'master' into master

1 files changed, 8 insertions, 16 deletions

diff --git a/src/script/cpp_api/s_nodemeta.h b/src/script/cpp_api/s_nodemeta.h
index 8c7cdd93e..609898a30 100644
--- a/src/script/cpp_api/s_nodemeta.h
+++ b/src/script/cpp_api/s_nodemeta.h
@@ -26,9 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct MoveAction;
 struct ItemStack;
 
-class ScriptApiNodemeta
-		: virtual public ScriptApiBase,
-		  public ScriptApiItem
+class ScriptApiNodemeta : virtual public ScriptApiBase, public ScriptApiItem
 {
 public:
 	ScriptApiNodemeta() = default;
@@ -36,28 +34,22 @@ public:
 
 	// Return number of accepted items to be moved
 	int nodemeta_inventory_AllowMove(
-			const MoveAction &ma, int count,
-			ServerActiveObject *player);
+			const MoveAction &ma, int count, ServerActiveObject *player);
 	// Return number of accepted items to be put
-	int nodemeta_inventory_AllowPut(
-			const MoveAction &ma, const ItemStack &stack,
+	int nodemeta_inventory_AllowPut(const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Return number of accepted items to be taken
-	int nodemeta_inventory_AllowTake(
-			const MoveAction &ma, const ItemStack &stack,
+	int nodemeta_inventory_AllowTake(const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Report moved items
 	void nodemeta_inventory_OnMove(
-			const MoveAction &ma, int count,
-			ServerActiveObject *player);
+			const MoveAction &ma, int count, ServerActiveObject *player);
 	// Report put items
-	void nodemeta_inventory_OnPut(
-			const MoveAction &ma, const ItemStack &stack,
+	void nodemeta_inventory_OnPut(const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Report taken items
-	void nodemeta_inventory_OnTake(
-			const MoveAction &ma, const ItemStack &stack,
+	void nodemeta_inventory_OnTake(const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
-private:
 
+private:
 };