20 files changed, 55 insertions, 55 deletions

diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp
index 6a3c6a55b..32b5133c7 100644
--- a/src/Blocks/BlockBed.cpp
+++ b/src/Blocks/BlockBed.cpp
@@ -122,16 +122,16 @@ void cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface
 				else
 				{
 					// Is foot end
-					VERIFY((Meta & 0x4) != 0x4); // Occupied flag should never be set, else our compilator (intended) is broken
+					VERIFY((Meta & 0x4) != 0x4);  // Occupied flag should never be set, else our compilator (intended) is broken
 
 					PillowDirection = MetaDataToDirection(Meta & 0x7);
-					if (a_ChunkInterface.GetBlock(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z) == E_BLOCK_BED) // Must always use pillow location for sleeping
+					if (a_ChunkInterface.GetBlock(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z) == E_BLOCK_BED)  // Must always use pillow location for sleeping
 					{
 						a_WorldInterface.GetBroadcastManager().BroadcastUseBed(*a_Player, a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z);
 					}
 				}
 
-				a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta | 0x4); // Where 0x4 = occupied bit
+				a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta | 0x4);  // Where 0x4 = occupied bit
 				a_Player->SetIsInBed(true);
 
 				cTimeFastForwardTester Tester;
@@ -140,7 +140,7 @@ void cBlockBedHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface
 					cPlayerBedStateUnsetter Unsetter(Vector3i(a_BlockX + PillowDirection.x, a_BlockY, a_BlockZ + PillowDirection.z), a_WorldInterface);
 					a_WorldInterface.ForEachPlayer(Unsetter);
 					a_WorldInterface.SetTimeOfDay(0);
-					a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0xB); // Where 0xB = 1011, and zero is to make sure 'occupied' bit is always unset
+					a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0xB);  // Where 0xB = 1011, and zero is to make sure 'occupied' bit is always unset
 				}
 			}			
 		}
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index 7f92681dc..9fc5e4626 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -74,7 +74,7 @@ public:
 			default:
 			{
 				ASSERT(!"Unhandled block face!");
-				return 0x0; // No idea, give a special meta (button in centre of block)
+				return 0x0;  // No idea, give a special meta (button in centre of block)
 			}
 		}
 	}
diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index 4dd05366d..6caaaab13 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -22,7 +22,7 @@ public:
 	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
-		Meta ^= 0x04; // Toggle 3rd (addition/subtraction) bit with XOR
+		Meta ^= 0x04;  // Toggle 3rd (addition/subtraction) bit with XOR
 		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);
 	}
 
diff --git a/src/Blocks/BlockDropSpenser.h b/src/Blocks/BlockDropSpenser.h
index e2b3039fd..cf240fa60 100644
--- a/src/Blocks/BlockDropSpenser.h
+++ b/src/Blocks/BlockDropSpenser.h
@@ -43,8 +43,8 @@ public:
 		// Mirrors defined by by a table. (Source, mincraft.gamepedia.com) 0x07 == 0111
 		switch (a_Meta & 0x07)
 		{
-			case 0x00: return 0x01 + OtherMeta; // Down -> Up
-			case 0x01: return 0x00 + OtherMeta; // Up -> Down
+			case 0x00: return 0x01 + OtherMeta;  // Down -> Up
+			case 0x01: return 0x00 + OtherMeta;  // Up -> Down
 		}
 		// Not Facing Up or Down; No change.
 		return a_Meta;
diff --git a/src/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderchest.h
index 67955f8ce..4672f1459 100644
--- a/src/Blocks/BlockEnderchest.h
+++ b/src/Blocks/BlockEnderchest.h
@@ -18,7 +18,7 @@ public:
 
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		//todo: Drop Ender Chest if using silk touch pickaxe
+		// todo: Drop Ender Chest if using silk touch pickaxe
 		a_Pickups.push_back(cItem(E_BLOCK_OBSIDIAN, 8, 0));
 	}
 
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h
index 390b6e5ee..ed0592acd 100644
--- a/src/Blocks/BlockFarmland.h
+++ b/src/Blocks/BlockFarmland.h
@@ -106,7 +106,7 @@ public:
 
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		a_Pickups.Add(E_BLOCK_DIRT, 1, 0); // Reset meta
+		a_Pickups.Add(E_BLOCK_DIRT, 1, 0);  // Reset meta
 	}
 } ;
 
diff --git a/src/Blocks/BlockFire.h b/src/Blocks/BlockFire.h
index 147e4b53e..f52825362 100644
--- a/src/Blocks/BlockFire.h
+++ b/src/Blocks/BlockFire.h
@@ -100,7 +100,7 @@ public:
 	/// Evaluates if coords have a valid border on top, based on MaxY
 	bool EvaluatePortalBorder(int X, int FoundObsidianY, int Z, int MaxY, cChunkInterface & a_ChunkInterface)
 	{
-		for (int checkBorder = FoundObsidianY + 1; checkBorder <= MaxY - 1; checkBorder++) // FoundObsidianY + 1: FoundObsidianY has already been checked in FindObsidianCeiling; MaxY - 1: portal doesn't need corners
+		for (int checkBorder = FoundObsidianY + 1; checkBorder <= MaxY - 1; checkBorder++)  // FoundObsidianY + 1: FoundObsidianY has already been checked in FindObsidianCeiling; MaxY - 1: portal doesn't need corners
 		{
 			if (a_ChunkInterface.GetBlock(X, checkBorder, Z) != E_BLOCK_OBSIDIAN)
 			{
@@ -115,10 +115,10 @@ public:
 	/// Finds entire frame in any direction with the coordinates of a base block and fills hole with nether portal (START HERE)
 	void FindAndSetPortalFrame(int X, int Y, int Z, cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface)
 	{
-		int MaxY = FindObsidianCeiling(X, Y, Z, a_ChunkInterface); // Get topmost obsidian block as reference for all other checks
-		int X1 = X + 1, Z1 = Z + 1, X2 = X - 1, Z2 = Z - 1; // Duplicate XZ values, add/subtract one as we've checked the original already the line above
+		int MaxY = FindObsidianCeiling(X, Y, Z, a_ChunkInterface);  // Get topmost obsidian block as reference for all other checks
+		int X1 = X + 1, Z1 = Z + 1, X2 = X - 1, Z2 = Z - 1;  // Duplicate XZ values, add/subtract one as we've checked the original already the line above
 
-		if (MaxY == 0) // Oh noes! Not a portal coordinate :(
+		if (MaxY == 0)  // Oh noes! Not a portal coordinate :(
 		{
 			return;
 		}
@@ -127,11 +127,11 @@ public:
 		{
 			if (!FindPortalSliceZ(X, Y, Z1, Z2, MaxY, a_ChunkInterface))
 			{
-				return; // No eligible portal construct, abort abort abort!!
+				return;  // No eligible portal construct, abort abort abort!!
 			}
 		}
 
-		for (int Height = Y + 1; Height <= MaxY - 1; Height++) // Loop through boundary to set portal blocks
+		for (int Height = Y + 1; Height <= MaxY - 1; Height++)  // Loop through boundary to set portal blocks
 		{
 			for (int Width = XZM; Width <= XZP; Width++)
 			{
@@ -153,23 +153,23 @@ public:
 	/// Takes coordinates of base block and Y coord of target obsidian ceiling
 	bool FindPortalSliceX(int X1, int X2, int Y, int Z, int MaxY, cChunkInterface & a_ChunkInterface)
 	{
-		Dir = 1; // Set assumed direction (will change if portal turns out to be facing the other direction)
+		Dir = 1;  // Set assumed direction (will change if portal turns out to be facing the other direction)
 		bool FoundFrameXP = false, FoundFrameXM = false;
-		for (; ((a_ChunkInterface.GetBlock(X1, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X1, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X1++) // Check XP for obsidian blocks, exempting corners
+		for (; ((a_ChunkInterface.GetBlock(X1, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X1, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X1++)  // Check XP for obsidian blocks, exempting corners
 		{
 			int Value = FindObsidianCeiling(X1, Y, Z, a_ChunkInterface, MaxY);
-			int ValueTwo = FindObsidianCeiling(X1, Y + 1, Z, a_ChunkInterface, MaxY); // For corners without obsidian
-			if ((Value == -1) || (ValueTwo == -1)) // FindObsidianCeiling returns -1 upon frame-find
+			int ValueTwo = FindObsidianCeiling(X1, Y + 1, Z, a_ChunkInterface, MaxY);  // For corners without obsidian
+			if ((Value == -1) || (ValueTwo == -1))  // FindObsidianCeiling returns -1 upon frame-find
 			{
-				FoundFrameXP = true; // Found a frame border in this direction, proceed in other direction (don't go further)
+				FoundFrameXP = true;  // Found a frame border in this direction, proceed in other direction (don't go further)
 				break;
 			}
-			else if ((Value != MaxY) && (ValueTwo != MaxY)) // Make sure that there is a valid portal 'slice'
+			else if ((Value != MaxY) && (ValueTwo != MaxY))  // Make sure that there is a valid portal 'slice'
 			{
-				return false; // Not valid slice, no portal can be formed
+				return false;  // Not valid slice, no portal can be formed
 			}
-		} XZP = X1 - 1; // Set boundary of frame interior
-		for (; ((a_ChunkInterface.GetBlock(X2, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X2, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X2--) // Go the other direction (XM)
+		} XZP = X1 - 1;  // Set boundary of frame interior
+		for (; ((a_ChunkInterface.GetBlock(X2, Y, Z) == E_BLOCK_OBSIDIAN) || (a_ChunkInterface.GetBlock(X2, Y + 1, Z) == E_BLOCK_OBSIDIAN)); X2--)  // Go the other direction (XM)
 		{
 			int Value = FindObsidianCeiling(X2, Y, Z, a_ChunkInterface, MaxY);
 			int ValueTwo = FindObsidianCeiling(X2, Y + 1, Z, a_ChunkInterface, MaxY);
@@ -182,7 +182,7 @@ public:
 			{
 				return false;
 			}
-		} XZM = X2 + 1; // Set boundary, see previous
+		} XZM = X2 + 1;  // Set boundary, see previous
 		return (FoundFrameXP && FoundFrameXM);
 	}
 
diff --git a/src/Blocks/BlockLadder.h b/src/Blocks/BlockLadder.h
index 120396c7d..2c41083e7 100644
--- a/src/Blocks/BlockLadder.h
+++ b/src/Blocks/BlockLadder.h
@@ -45,7 +45,7 @@ public:
 
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		a_Pickups.Add(m_BlockType, 1, 0); // Reset meta
+		a_Pickups.Add(m_BlockType, 1, 0);  // Reset meta
 	}
 
 
diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h
index 495e849fa..260abefc7 100644
--- a/src/Blocks/BlockLeaves.h
+++ b/src/Blocks/BlockLeaves.h
@@ -76,7 +76,7 @@ public:
 	virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
-		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0x7);	 // Unset 0x8 bit so it gets checked for decay
+		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta & 0x7);  // Unset 0x8 bit so it gets checked for decay
 	}
 	
 	
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
index ec480aaea..6ffb56abd 100644
--- a/src/Blocks/BlockPiston.cpp
+++ b/src/Blocks/BlockPiston.cpp
@@ -235,7 +235,7 @@ void cBlockPistonHandler::RetractPiston(int a_BlockX, int a_BlockY, int a_BlockZ
 
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 // cBlockPistonHeadHandler:
 
 cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) :
@@ -262,7 +262,7 @@ void cBlockPistonHeadHandler::OnDestroyedByPlayer(cChunkInterface & a_ChunkInter
 		a_ChunkInterface.DigBlock(a_WorldInterface, newX, newY, newZ);
 		if (a_Player->IsGameModeCreative())
 		{
-			return; // No pickups if creative
+			return;  // No pickups if creative
 		}
 
 		cItems Pickups;
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index 1c8ac6a35..307539476 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -132,7 +132,7 @@ private:
 	{
 		if (cBlockInfo::IsPistonBreakable(a_BlockType))
 		{
-			return false; // CanBreakPush returns true, but we need false to prevent pulling
+			return false;  // CanBreakPush returns true, but we need false to prevent pulling
 		}
 		
 		return CanPush(a_BlockType, a_BlockMeta);
diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h
index 3b8030028..d58b2f09d 100644
--- a/src/Blocks/BlockPortal.h
+++ b/src/Blocks/BlockPortal.h
@@ -36,7 +36,7 @@ public:
 
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		return; // No pickups
+		return;  // No pickups
 	}
 
 	virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
@@ -57,7 +57,7 @@ public:
 	{
 		if ((a_RelY - 1 < 0) || (a_RelY + 1 > cChunkDef::Height))
 		{
-			return false; // In case someone places a portal with meta 1 or 2 at boundaries, and server tries to get invalid coords at Y - 1 or Y + 1
+			return false;  // In case someone places a portal with meta 1 or 2 at boundaries, and server tries to get invalid coords at Y - 1 or Y + 1
 		}
 
 		switch (a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ))
diff --git a/src/Blocks/BlockQuartz.h b/src/Blocks/BlockQuartz.h
index 9cc51490f..1b1f6f9f0 100644
--- a/src/Blocks/BlockQuartz.h
+++ b/src/Blocks/BlockQuartz.h
@@ -25,7 +25,7 @@ public:
 	{
 		a_BlockType = m_BlockType;
 		NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
-		if (Meta != E_META_QUARTZ_PILLAR) // Check if the block is a pillar block.
+		if (Meta != E_META_QUARTZ_PILLAR)  // Check if the block is a pillar block.
 		{
 			a_BlockMeta = Meta;
 			return true;
@@ -42,25 +42,25 @@ public:
 			case BLOCK_FACE_YM:
 			case BLOCK_FACE_YP:
 			{
-				return a_QuartzMeta; // Top or bottom, just return original
+				return a_QuartzMeta;  // Top or bottom, just return original
 			}
 
 			case BLOCK_FACE_ZP:
 			case BLOCK_FACE_ZM:
 			{
-				return 0x4; // North or south
+				return 0x4;  // North or south
 			}
 
 			case BLOCK_FACE_XP:
 			case BLOCK_FACE_XM:
 			{
-				return 0x3; // East or west
+				return 0x3;  // East or west
 			}
 
 			default:
 			{
 				ASSERT(!"Unhandled block face!");
-				return a_QuartzMeta; // No idea, give a special meta (all sides the same)
+				return a_QuartzMeta;  // No idea, give a special meta (all sides the same)
 			}
 		}
 	}
diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h
index 358b5ca11..6f3fa1bd5 100644
--- a/src/Blocks/BlockRail.h
+++ b/src/Blocks/BlockRail.h
@@ -140,7 +140,7 @@ public:
 	{
 		NIBBLETYPE Meta = 0;
 		char RailsCnt = 0;
-		bool Neighbors[8]; // 0 - EAST, 1 - WEST, 2 - NORTH, 3 - SOUTH, 4 - EAST UP, 5 - WEST UP, 6 - NORTH UP, 7 - SOUTH UP
+		bool Neighbors[8];  // 0 - EAST, 1 - WEST, 2 - NORTH, 3 - SOUTH, 4 - EAST UP, 5 - WEST UP, 6 - NORTH UP, 7 - SOUTH UP
 		memset(Neighbors, 0, sizeof(Neighbors));
 		Neighbors[0] = (IsUnstable(a_ChunkInterface, a_BlockX + 1, a_BlockY, a_BlockZ) || !IsNotConnected(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_EAST, E_PURE_DOWN));
 		Neighbors[1] = (IsUnstable(a_ChunkInterface, a_BlockX - 1, a_BlockY, a_BlockZ) || !IsNotConnected(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_WEST, E_PURE_DOWN));
diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h
index fe6cd21b9..4c8a6a087 100644
--- a/src/Blocks/BlockRedstoneRepeater.h
+++ b/src/Blocks/BlockRedstoneRepeater.h
@@ -71,7 +71,7 @@ public:
 
 	inline static NIBBLETYPE RepeaterRotationToMetaData(double a_Rotation)
 	{
-		a_Rotation += 90 + 45; // So its not aligned with axis
+		a_Rotation += 90 + 45;  // So its not aligned with axis
 		if (a_Rotation > 360)
 		{
 			a_Rotation -= 360;
diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h
index 5b37efd75..9cbd4cf97 100644
--- a/src/Blocks/BlockSideways.h
+++ b/src/Blocks/BlockSideways.h
@@ -32,7 +32,7 @@ public:
 
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3); // Reset meta
+		a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3);  // Reset meta
 	}
 
 
@@ -43,25 +43,25 @@ public:
 			case BLOCK_FACE_YM:
 			case BLOCK_FACE_YP:
 			{
-				return a_Meta; // Top or bottom, just return original
+				return a_Meta;  // Top or bottom, just return original
 			}
 
 			case BLOCK_FACE_ZP:
 			case BLOCK_FACE_ZM:
 			{
-				return a_Meta | 0x8; // North or south
+				return a_Meta | 0x8;  // North or south
 			}
 
 			case BLOCK_FACE_XP:
 			case BLOCK_FACE_XM:
 			{
-				return a_Meta | 0x4; // East or west
+				return a_Meta | 0x4;  // East or west
 			}
 
 			default:
 			{
 				ASSERT(!"Unhandled block face!");
-				return a_Meta | 0xC; // No idea, give a special meta
+				return a_Meta | 0xC;  // No idea, give a special meta
 			}
 		}
 	}
diff --git a/src/Blocks/BlockSnow.h b/src/Blocks/BlockSnow.h
index b21995d3c..c5ae4a5a6 100644
--- a/src/Blocks/BlockSnow.h
+++ b/src/Blocks/BlockSnow.h
@@ -47,12 +47,12 @@ public:
 	{
 		if ((a_Player->GetEquippedItem().m_ItemType == E_BLOCK_SNOW) && (a_Meta < 7))
 		{
-			return true; // If a player is holding a (thin) snow block and it's size can be increased, return collision ignored
+			return true;  // If a player is holding a (thin) snow block and it's size can be increased, return collision ignored
 		}
 
 		if (a_Meta == 0)
 		{
-			return true; // If at normal snowfall height (lowest), we ignore collision
+			return true;  // If at normal snowfall height (lowest), we ignore collision
 		}
 
 		return false;
diff --git a/src/Blocks/BlockStairs.h b/src/Blocks/BlockStairs.h
index a49fda5ae..e74ab0094 100644
--- a/src/Blocks/BlockStairs.h
+++ b/src/Blocks/BlockStairs.h
@@ -85,7 +85,7 @@ public:
 	
 	static NIBBLETYPE RotationToMetaData(double a_Rotation)
 	{
-		a_Rotation += 90 + 45; // So its not aligned with axis
+		a_Rotation += 90 + 45;  // So its not aligned with axis
 		if (a_Rotation > 360)
 		{
 			a_Rotation -= 360;
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index 44c33c429..554ab8125 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -28,7 +28,7 @@ public:
 
 		if ((a_BlockFace == BLOCK_FACE_TOP) || (a_BlockFace == BLOCK_FACE_BOTTOM))
 		{
-			a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ); // Top or bottom faces clicked, find a suitable face
+			a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);  // Top or bottom faces clicked, find a suitable face
 			if (a_BlockFace == BLOCK_FACE_NONE)
 			{
 				// Client wouldn't have sent anything anyway, but whatever
@@ -38,10 +38,10 @@ public:
 		else
 		{
 			// Not top or bottom faces, try to preserve whatever face was clicked
-			AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, true); // Set to clicked block
+			AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, true);  // Set to clicked block
 			if (!CanBePlacedOn(a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ), a_BlockFace))
 			{
-				AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false); // Reset to torch block
+				AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, false);  // Reset to torch block
 				// Torch couldn't be placed on whatever face was clicked, last ditch resort - find another face
 				a_BlockFace = FindSuitableFace(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);
 				if (a_BlockFace == BLOCK_FACE_NONE)
@@ -113,13 +113,13 @@ public:
 	/// Finds a suitable face to place the torch, returning BLOCK_FACE_NONE on failure
 	static eBlockFace FindSuitableFace(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ)
 	{
-		for (int i = BLOCK_FACE_YM; i <= BLOCK_FACE_XP; i++) // Loop through all directions
+		for (int i = BLOCK_FACE_YM; i <= BLOCK_FACE_XP; i++)  // Loop through all directions
 		{
 			eBlockFace Face = static_cast<eBlockFace>(i);
 			AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, Face, true);
 			BLOCKTYPE BlockInQuestion = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 
-			if ( // If on a block that can only hold a torch if torch is standing on it, return that face
+			if (  // If on a block that can only hold a torch if torch is standing on it, return that face
 				((BlockInQuestion == E_BLOCK_GLASS) ||
 				(BlockInQuestion == E_BLOCK_FENCE) ||
 				(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
@@ -158,7 +158,7 @@ public:
 			(BlockInQuestion == E_BLOCK_FENCE) ||
 			(BlockInQuestion == E_BLOCK_SOULSAND) ||
 			(BlockInQuestion == E_BLOCK_MOB_SPAWNER) ||
-			(BlockInQuestion == E_BLOCK_END_PORTAL_FRAME) || // Actual vanilla behaviour
+			(BlockInQuestion == E_BLOCK_END_PORTAL_FRAME) ||  // Actual vanilla behaviour
 			(BlockInQuestion == E_BLOCK_NETHER_BRICK_FENCE) ||
 			(BlockInQuestion == E_BLOCK_COBBLESTONE_WALL)
 			)
diff --git a/src/Blocks/MetaRotator.h b/src/Blocks/MetaRotator.h
index 899c583e1..ad8f36183 100644
--- a/src/Blocks/MetaRotator.h
+++ b/src/Blocks/MetaRotator.h
@@ -6,7 +6,7 @@
 
 // MSVC generates warnings for the templated AssertIfNotMatched parameter conditions, so disable it:
 #ifdef _MSC_VER
-	#pragma warning(disable: 4127) // Conditional expression is constant
+	#pragma warning(disable: 4127)  // Conditional expression is constant
 #endif