From 24efa6f8645c2f310997c212907fb4e591d0afec Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Thu, 22 Dec 2011 21:36:24 +0000 Subject: =?UTF-8?q?Digging=20leaves=20with=20shears=20now=20drops=20leaves?= =?UTF-8?q?=20Falling=20Sand=20now=20notifies=20water=20around=20Implement?= =?UTF-8?q?ed=20Function=20to=20get=20the=20relative=20chunk=20position=20?= =?UTF-8?q?in=20the=20total=20position=20(cChunk::PositionToWorldPosition)?= =?UTF-8?q?=20Pistons=20don=C2=B4t=20drop=20water=20and=20lava=20items=20a?= =?UTF-8?q?nymore=20when=20stopping=20water/lava=20implemented=20Getter=20?= =?UTF-8?q?for=20lava=20and=20water=20simulator=20IsBlockWater=20and=20IsB?= =?UTF-8?q?lockLava=20function=20in=20Defines.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://mc-server.googlecode.com/svn/trunk@97 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cClientHandle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/cClientHandle.cpp') diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp index a1e24c576..b8de73467 100644 --- a/source/cClientHandle.cpp +++ b/source/cClientHandle.cpp @@ -503,7 +503,7 @@ void cClientHandle::HandlePacket( cPacket* a_Packet ) m_Player->SetLastBlockActionCnt(LastActionCnt+1); if (LastActionCnt > 3) { //kick if more than 3 interactions per .1 seconds LOGWARN("Player %s tried to interact with a block too quickly! (could indicate bot) Was Kicked.", GetUsername() ); - //To many false-positives :s for example on a minimal server lagg :s should be re checked + //TODO Too many false-positives :s for example on a minimal server lagg :s should be re checked Kick("You're a baaaaaad boy!"); break; } @@ -524,6 +524,7 @@ void cClientHandle::HandlePacket( cPacket* a_Packet ) char OldBlock = World->GetBlock(PacketData->m_PosX, PacketData->m_PosY, PacketData->m_PosZ); char MetaData = World->GetBlockMeta(PacketData->m_PosX, PacketData->m_PosY, PacketData->m_PosZ); bool bBroken = (PacketData->m_Status == 0x02) || g_BlockOneHitDig[(int)OldBlock] || ( (PacketData->m_Status == 0x00) && (m_Player->GetGameMode() == 1) ); + if(bBroken == false) bBroken = (m_Player->GetInventory().GetEquippedItem().m_ItemID == E_ITEM_SHEARS && OldBlock == E_BLOCK_LEAVES); cItem PickupItem; if( bBroken && !(m_Player->GetGameMode() == 1) ) // broken -- cgit v1.2.3