From 1897f678f93bb038fdc4caf1fb2995a28ef8f92e Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Tue, 19 Aug 2014 16:08:17 +0200
Subject: Added more enchantments and some fixes

- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
---
 src/Blocks/BlockHandler.cpp | 32 ++++++++++++++++++++++++++++----
 src/Blocks/BlockIce.h       | 24 ++++++++++++------------
 2 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'src/Blocks')

diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 52f7dd608..3c85a31e0 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -424,19 +424,43 @@ void cBlockHandler::DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterfac
 	cItems Pickups;
 	NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
 
-	if (a_CanDrop)
+	// Thanks to daniel0916
+	cPlayer * Player = (cPlayer *)a_Digger;
+	cEnchantments Enchantments = Player->GetInventory().GetEquippedItem().m_Enchantments;
+	if (Enchantments.GetLevel(cEnchantments::enchSilkTouch) > 0)
 	{
-		if (!a_DropVerbatim)
+		BLOCKTYPE Type = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ);
+		if (Type == E_BLOCK_CAKE || Type == E_BLOCK_CARROTS || Type == E_BLOCK_COCOA_POD || Type == E_BLOCK_DOUBLE_STONE_SLAB ||
+			Type == E_BLOCK_DOUBLE_WOODEN_SLAB || Type == E_BLOCK_FIRE || Type == E_BLOCK_FARMLAND || Type == E_BLOCK_MELON_STEM ||
+			Type == E_BLOCK_MOB_SPAWNER || Type == E_BLOCK_NETHER_WART || Type == E_BLOCK_POTATOES || Type == E_BLOCK_PUMPKIN_STEM ||
+			Type == E_BLOCK_SNOW || Type == E_BLOCK_SUGARCANE || Type == E_BLOCK_TALL_GRASS || Type == E_BLOCK_CROPS
+			)
 		{
+			// Silktouch can't be used for this blocks
 			ConvertToPickups(Pickups, Meta);
 		}
 		else
 		{
-			// TODO: Add a proper overridable function for this
 			Pickups.Add(m_BlockType, 1, Meta);
 		}
 	}
-	
+	else
+	{
+		if (a_CanDrop)
+		{
+			if (!a_DropVerbatim)
+			{
+				ConvertToPickups(Pickups, Meta);
+			}
+			else
+			{
+				// TODO: Add a proper overridable function for this
+				Pickups.Add(m_BlockType, 1, Meta);
+			}
+		}
+
+	}
+
 	// Allow plugins to modify the pickups:
 	a_BlockPluginInterface.CallHookBlockToPickups(a_Digger, a_BlockX, a_BlockY, a_BlockZ, m_BlockType, Meta, Pickups);
 	
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h
index c38630fe3..cfe1d179f 100644
--- a/src/Blocks/BlockIce.h
+++ b/src/Blocks/BlockIce.h
@@ -30,18 +30,18 @@ public:
 		{
 			return;
 		}
-
-		BLOCKTYPE BlockBelow = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ);
-		if (!cBlockInfo::FullyOccupiesVoxel(BlockBelow) && !IsBlockLiquid(BlockBelow))
+		
+		cEnchantments Enchantments = a_Player->GetInventory().GetEquippedItem().m_Enchantments;
+		if (Enchantments.GetLevel(cEnchantments::enchSilkTouch) == 0)
 		{
-			return;
+			BLOCKTYPE BlockBelow = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ);
+			if (!cBlockInfo::FullyOccupiesVoxel(BlockBelow) && !IsBlockLiquid(BlockBelow))
+			{
+				return;
+			}
+
+			a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WATER, 0);
+			// This is called later than the real destroying of this ice block
 		}
-
-		a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WATER, 0);
-		// This is called later than the real destroying of this ice block
 	}
-} ;
-
-
-
-
+} ;
\ No newline at end of file
-- 
cgit v1.2.3