Merge branch 'master' of github.com:mc-server/MCServer

cuberite · May 30, 2015 · 9b798ff9dd5a9c93f39ce7c4dc51332f7a986a24 · 9b798ff
2 parents bca13d9 + 4504ec7
commit 9b798ff9dd5a9c93f39ce7c4dc51332f7a986a24
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 MCServer/Plugins/MagicCarpet

+1 −1 src/Mobs/Path.cpp
diff --git a/MCServer/Plugins/MagicCarpet b/MCServer/Plugins/MagicCarpet
diff --git a/src/Mobs/Path.cpp b/src/Mobs/Path.cpp
@@ -162,7 +162,7 @@ bool cPath::IsSolid(const Vector3i & a_Location)
 			(BlockType == E_BLOCK_FENCE_GATE) ||
 			(BlockType == E_BLOCK_NETHER_BRICK_FENCE) ||
 			((BlockType >= E_BLOCK_SPRUCE_FENCE_GATE) && (BlockType <= E_BLOCK_ACACIA_FENCE))
-		)
+	)
 	{
 		// TODO move this out of IsSolid to a proper place.
 		GetCell(a_Location + Vector3i(0, 1, 0))->m_IsSolid = true;  // Mobs will always think that the fence is 2 blocks high and therefore won't jump over.