2 files changed, 29 insertions, 0 deletions

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 3711262b6..38301b86f 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -32,6 +32,7 @@
 
 #include "Protocol/ProtocolRecognizer.h"
 #include "CompositeChat.h"
+#include "Items/ItemSword.h"
 
 
 
@@ -794,6 +795,15 @@ void cClientHandle::HandleBlockDigStarted(int a_BlockX, int a_BlockY, int a_Bloc
 		return;
 	}
 	
+	if (
+		m_Player->IsGameModeCreative() &&
+		cItemSwordHandler::IsSword(m_Player->GetInventory().GetEquippedItem().m_ItemType)
+	)
+	{
+		// Players can't destroy blocks with a Sword in the hand.
+		return;
+	}
+	
 	if (cRoot::Get()->GetPluginManager()->CallHookPlayerBreakingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_OldBlock, a_OldMeta))
 	{
 		// A plugin doesn't agree with the breaking. Bail out. Send the block back to the client, so that it knows:
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index a7c1d2432..07d121d5c 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -23,6 +23,25 @@ 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;
+			}
+		}
+	}
 } ;