flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into Inventory

Browse Source
This commit is contained in:
Howaner
2014-09-02 20:11:38 +02:00
parent 3ee3a59e75 4837d41368
commit e431bb4e63
56 changed files with 1483 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ClientHandle.cpp
View File

@@ -1059,7 +1059,8 @@ void cClientHandle::HandleBlockDigStarted(int a_BlockX, int a_BlockY, int a_Bloc
if (
m_Player->IsGameModeCreative() &&
ItemCategory::IsSword(m_Player->GetInventory().GetEquippedItem().m_ItemType)
ItemCategory::IsSword(m_Player->GetInventory().GetEquippedItem().m_ItemType) &&
(m_Player->GetWorld()->GetBlock(a_BlockX, a_BlockY, a_BlockZ) != E_BLOCK_FIRE)
)
{
// Players can't destroy blocks with a Sword in the hand.