From ea8545dff189312ad1300fddb2f2ead7d5cf1c59 Mon Sep 17 00:00:00 2001 From: "luksor111@gmail.com" Date: Thu, 15 Nov 2012 18:57:47 +0000 Subject: - Added the "wait" music disc - Vines can now be placed on leaves git-svn-id: http://mc-server.googlecode.com/svn/trunk@1045 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Blocks/BlockVine.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source/Blocks') diff --git a/source/Blocks/BlockVine.h b/source/Blocks/BlockVine.h index b71997f2a..cdef18520 100644 --- a/source/Blocks/BlockVine.h +++ b/source/Blocks/BlockVine.h @@ -35,10 +35,12 @@ public: return true; } - if (g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY + 1, a_BlockZ )]) + BLOCKTYPE TopBlock = a_World->GetBlock( a_BlockX, a_BlockY + 1, a_BlockZ); + if (g_BlockIsSolid[TopBlock] || TopBlock==E_BLOCK_LEAVES) { AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true ); - if (g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ )]==false) + BLOCKTYPE BaseBlock = a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ); + if (g_BlockIsSolid[BaseBlock] == false && BaseBlock!=E_BLOCK_LEAVES) { AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, false ); a_World->SetBlock( a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_VINES, 0); @@ -47,8 +49,8 @@ public: } AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true ); - - return g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ)]; + BLOCKTYPE BaseBlock = a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ); + return g_BlockIsSolid[BaseBlock] || BaseBlock==E_BLOCK_LEAVES; } -- cgit v1.2.3