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

Use the ItemCategorie::IsSword() Method.

Browse Source
This commit is contained in:
Howaner 2014-02-23 20:31:58 +01:00
parent cc34898e45
commit 084971424f
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ClientHandle.cpp
View File

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

19
src/Items/ItemSword.h
View File

@ -23,25 +23,6 @@ public:
{ {
return (a_BlockType == E_BLOCK_COBWEB); return (a_BlockType == E_BLOCK_COBWEB);
} }
inline static bool IsSword(int id)
{
switch (id)
{
case E_ITEM_WOODEN_SWORD:
case E_ITEM_STONE_SWORD:
case E_ITEM_IRON_SWORD:
case E_ITEM_GOLD_SWORD:
case E_ITEM_DIAMOND_SWORD:
{
return true;
}
default:
{
return false;
}
}
}
} ; } ;