Corrected drops from dead bush, tall grass and cobweb.

cuberite · Oct 7, 2014 · a5e0915 · a5e0915
1 parent e8e428a
commit a5e0915
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 39 deletions.
diff --git a/src/Blocks/BlockDeadBush.h b/src/Blocks/BlockDeadBush.h
@@ -17,15 +17,25 @@ class cBlockDeadBushHandler :
 	}
 
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
-	{
-		// Don't drop anything
-	}
-
-
 	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
-		return (a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) == E_BLOCK_SAND);
+		if (a_RelY <= 0)
+		{
+			return false;
+		}
+
+		BLOCKTYPE BelowBlock = a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ);
+		switch (BelowBlock)
+		{
+			case E_BLOCK_CLAY:
+			case E_BLOCK_HARDENED_CLAY:
+			case E_BLOCK_STAINED_CLAY:
+			case E_BLOCK_SAND:
+			{
+				return true;
+			}
+			default: return false;
+		}
 	}
 } ;
 

diff --git a/src/Blocks/BlockTallGrass.h b/src/Blocks/BlockTallGrass.h
@@ -26,32 +26,23 @@ class cBlockTallGrassHandler :
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Drop seeds, sometimes
-		MTRand r1;
-		if (r1.randInt(10) == 5)
+		cFastRandom Random;
+		if (Random.NextInt(8) == 0)
 		{
 			a_Pickups.push_back(cItem(E_ITEM_SEEDS, 1, 0));
 		}
 	}
 
 
-	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
+	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
-		NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
-
-		if ((!a_Player->IsGameModeCreative()) && (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SHEARS))
+		if (a_RelY <= 0)
 		{
-			cItems Pickups;
-			Pickups.Add(E_BLOCK_TALL_GRASS, 1, Meta);
-			a_WorldInterface.SpawnItemPickups(Pickups, a_BlockX, a_BlockY, a_BlockZ);
-
-			a_Player->UseEquippedItem();
+			return false;
 		}
-	}
 
-
-	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
-	{
-		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
+		BLOCKTYPE BelowBlock = a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ);
+		return IsBlockTypeOfDirt(BelowBlock);
 	}
 } ;
 

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
@@ -1113,16 +1113,16 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
 	cWorld * World = m_Player->GetWorld();
 	cItemHandler * ItemHandler = cItemHandler::GetItemHandler(m_Player->GetEquippedItem());
 
-	if (cRoot::Get()->GetPluginManager()->CallHookPlayerBreakingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_OldBlock, a_OldMeta))
+	if (a_OldBlock == E_BLOCK_AIR)
 	{
-		// A plugin doesn't agree with the breaking. Bail out. Send the block back to the client, so that it knows:
-		m_Player->GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
+		LOGD("Dug air - what the function?");
 		return;
 	}
 
-	if (a_OldBlock == E_BLOCK_AIR)
+	if (cRoot::Get()->GetPluginManager()->CallHookPlayerBreakingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_OldBlock, a_OldMeta))
 	{
-		LOGD("Dug air - what the function?");
+		// A plugin doesn't agree with the breaking. Bail out. Send the block back to the client, so that it knows:
+		m_Player->GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, m_Player);
 		return;
 	}
 

diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
@@ -572,6 +572,8 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_COBBLESTONE:
 		case E_BLOCK_COBBLESTONE_STAIRS:
 		case E_BLOCK_COBBLESTONE_WALL:
+		case E_BLOCK_COBWEB:
+		case E_BLOCK_DEAD_BUSH:
 		case E_BLOCK_DIAMOND_BLOCK:
 		case E_BLOCK_DIAMOND_ORE:
 		case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
@@ -587,13 +589,15 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_IRON_TRAPDOOR:
 		case E_BLOCK_LAPIS_BLOCK:
 		case E_BLOCK_LAPIS_ORE:
+		case E_BLOCK_LEAVES:
 		case E_BLOCK_LIT_FURNACE:
 		case E_BLOCK_MOB_SPAWNER:
 		case E_BLOCK_MOSSY_COBBLESTONE:
 		case E_BLOCK_NETHER_BRICK:
 		case E_BLOCK_NETHER_BRICK_STAIRS:
 		case E_BLOCK_NETHER_BRICK_FENCE:
 		case E_BLOCK_NETHERRACK:
+		case E_BLOCK_NEW_LEAVES:
 		case E_BLOCK_NEW_STONE_SLAB:
 		case E_BLOCK_OBSIDIAN:
 		case E_BLOCK_PACKED_ICE:

diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h
@@ -28,21 +28,25 @@ class cItemShearsHandler :
 
 	virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
-		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
+		BLOCKTYPE Block;
+		NIBBLETYPE BlockMeta;
+		a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
+
 		if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES))
 		{
-			NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
+			cItems Drops;
 			cBlockHandler * Handler = cBlockInfo::GetHandler(Block);
 
-			cItems Drops;
-			Handler->ConvertToPickups(Drops, Meta);
-			Drops.push_back(cItem(Block, 1, Meta & 3));
+			Handler->ConvertToPickups(Drops, BlockMeta);
+			Drops.Add(Block, 1, BlockMeta & 3);
 			a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
 
 			a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
+			a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
 			a_Player->UseEquippedItem();
 			return true;
 		}
+
 		return false;
 	}
 
@@ -53,12 +57,10 @@ class cItemShearsHandler :
 		{
 			case E_BLOCK_COBWEB:
 			case E_BLOCK_VINES:
-			case E_BLOCK_LEAVES:
-			case E_BLOCK_NEW_LEAVES:
 			{
 				return true;
 			}
-		}  // switch (a_BlockType)
+		}
 		return super::CanHarvestBlock(a_BlockType);
 	}
 
@@ -71,12 +73,30 @@ class cItemShearsHandler :
 
 	virtual void OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
-		super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
+		BLOCKTYPE Block;
+		NIBBLETYPE BlockMeta;
+		a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
 
-		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
-		if ((Block == E_BLOCK_TRIPWIRE) || (Block == E_BLOCK_VINES))
+		if ((Block == E_BLOCK_TALL_GRASS) && !a_Player->IsGameModeCreative())
 		{
+			cItems Drops;
+			Drops.Add(Block, 1, BlockMeta);
+			a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
 			a_Player->UseEquippedItem();
+			return;
+		}
+
+		super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
+		switch (Block)
+		{
+			case E_BLOCK_COBWEB:
+			case E_BLOCK_DEAD_BUSH:
+			case E_BLOCK_TRIPWIRE:
+			case E_BLOCK_VINES:
+			case E_BLOCK_WOOL:
+			{
+				a_Player->UseEquippedItem();
+			}
 		}
 	}
 } ;