1
0

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

This commit is contained in:
tycho 2015-05-30 13:34:08 +01:00
commit 9b798ff9dd
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 493f2dfa6d39f134e37c4c614cf8d6ffd10c825f
Subproject commit 94da343b62f0498a5843247f36d6ee00cbeb8f21

View File

@ -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.