From 7450e573c3f3cb4f48e3be4b7865bf1fd4dd6b4e Mon Sep 17 00:00:00 2001 From: "cedeel@gmail.com" Date: Thu, 14 Jun 2012 20:06:25 +0000 Subject: Fixes placing blocks on snow. Also a little formatting. git-svn-id: http://mc-server.googlecode.com/svn/trunk@611 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cClientHandle.cpp | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp index 58c344d4f..92388301c 100644 --- a/source/cClientHandle.cpp +++ b/source/cClientHandle.cpp @@ -1031,23 +1031,32 @@ void cClientHandle::HandleBlockPlace(cPacket_BlockPlace * a_Packet) if (ClickedBlock == E_BLOCK_STEP) { - // Only make double slab if meta values are the same and if player clicked either on top or on bottom of the block (direction either 0 or 1) - // TODO check if it works from beneath + // Only make double slab if meta values are the same and if player clicked either on top or on bottom of the block (direction either 0 or 1) + // TODO check if it works from beneath if (MetaData == ( m_Player->GetWorld()->GetBlockMeta(a_Packet->m_PosX, a_Packet->m_PosY, a_Packet->m_PosZ) & 0x7) && a_Packet->m_Direction <= 1) //if (MetaData == m_Player->GetWorld()->GetBlockMeta(a_Packet->m_PosX, a_Packet->m_PosY, a_Packet->m_PosZ) && a_Packet->m_Direction == 1) { - a_Packet->m_ItemType = E_BLOCK_DOUBLE_STEP; + a_Packet->m_ItemType = E_BLOCK_DOUBLE_STEP; if(a_Packet->m_Direction == 1) - { - a_Packet->m_PosY--; - } - else - { - a_Packet->m_PosY++; - } + { + a_Packet->m_PosY--; + } + else + { + a_Packet->m_PosY++; + } bIgnoreCollision = true; } } + + if (ClickedBlock == E_BLOCK_SNOW) + { + if (a_Packet->m_Direction == 1) + { + a_Packet->m_PosY--; + } + bIgnoreCollision = true; + } // Special handling for special items: switch (a_Packet->m_ItemType) @@ -2082,3 +2091,5 @@ void cClientHandle::SocketClosed(void) + + -- cgit v1.2.3