diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 38301b86f..4715eb100 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -797,7 +797,7 @@ void cClientHandle::HandleBlockDigStarted(int a_BlockX, int a_BlockY, int a_Bloc
 	
 	if (
 		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.
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index 07d121d5c..a7c1d2432 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -23,25 +23,6 @@ public:
 	{
 		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;
-			}
-		}
-	}
 } ;