Merge pull request #1487 from mc-server/BlockFixes

Block fixes

src/BlockID.h

@@ -477,6 +477,7 @@ enum
 	// E_BLOCK_DIRT metas:
 	E_META_DIRT_NORMAL    = 0,
 	E_META_DIRT_GRASSLESS = 1,
+	E_META_DIRT_COARSE    = 1,
 	E_META_DIRT_PODZOL    = 2,
 	
 	// E_BLOCK_DISPENSER / E_BLOCK_DROPPER metas:

src/BlockInfo.cpp

@@ -329,6 +329,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info)
 	a_Info[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE].m_PistonBreakable = true;
 	a_Info[E_BLOCK_INACTIVE_COMPARATOR ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_IRON_DOOR           ].m_PistonBreakable = true;
+	a_Info[E_BLOCK_IRON_TRAPDOOR       ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_JACK_O_LANTERN      ].m_PistonBreakable = true;
 	a_Info[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE].m_PistonBreakable = true;
 	a_Info[E_BLOCK_LILY_PAD            ].m_PistonBreakable = true;

src/Blocks/BlockDirt.h

@@ -21,7 +21,15 @@ public:
 	
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));
+		if (a_BlockMeta == E_META_DIRT_COARSE)
+		{
+			// Drop the coarse block (dirt, meta 1)
+			a_Pickups.Add(E_BLOCK_DIRT, 1, E_META_DIRT_COARSE);
+		}
+		else
+		{
+			a_Pickups.Add(E_BLOCK_DIRT, 1, E_META_DIRT_NORMAL);
+		}
 	}
 	
 	

src/Blocks/BlockDoor.h

@@ -173,7 +173,23 @@ public:
 	/** Returns true if the specified blocktype is any kind of door */
 	inline static bool IsDoor(BLOCKTYPE a_Block)
 	{
-		return (a_Block == E_BLOCK_WOODEN_DOOR) || (a_Block == E_BLOCK_IRON_DOOR);
+		switch (a_Block)
+		{
+			case E_BLOCK_ACACIA_DOOR:
+			case E_BLOCK_BIRCH_DOOR:
+			case E_BLOCK_DARK_OAK_DOOR:
+			case E_BLOCK_IRON_DOOR:
+			case E_BLOCK_JUNGLE_DOOR:
+			case E_BLOCK_SPRUCE_DOOR:
+			case E_BLOCK_WOODEN_DOOR:
+			{
+				return true;
+			}
+			default:
+			{
+				return false;
+			}
+		}
 	}
 
 

src/Blocks/BlockTrapdoor.h

@@ -29,6 +29,12 @@ public:
 
 	virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
 	{
+		if (m_BlockType == E_BLOCK_IRON_TRAPDOOR)
+		{
+			// Iron doors can only be toggled by redstone, not by right-clicking
+			return;
+		}
+
 		// Flip the ON bit on/off using the XOR bitwise operation
 		NIBBLETYPE Meta = (a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x04);
 		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);

src/Items/ItemHoe.h

@@ -24,12 +24,35 @@ public:
 		{
 			return false;
 		}
-		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 		BLOCKTYPE UpperBlock = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ);
 
+		BLOCKTYPE Block;
+		NIBBLETYPE BlockMeta;
+		a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
+
 		if (((Block == E_BLOCK_DIRT) || (Block == E_BLOCK_GRASS)) && (UpperBlock == E_BLOCK_AIR))
 		{
-			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FARMLAND, 0);
+			BLOCKTYPE NewBlock = E_BLOCK_FARMLAND;
+			if (Block == E_BLOCK_DIRT)
+			{
+				switch (BlockMeta)
+				{
+					case E_META_DIRT_COARSE:
+					{
+						// Transform to normal dirt
+						NewBlock = E_BLOCK_DIRT;
+						break;
+					}
+					case E_META_DIRT_PODZOL:
+					{
+						// You can't transform this block with a hoe in vanilla
+						return false;
+					}
+					default: break;
+				}
+			}
+
+			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, NewBlock, 0);
 			a_World->BroadcastSoundEffect("dig.gravel", a_BlockX + 0.5, a_BlockY + 0.5, a_BlockZ + 0.5, 1.0f, 0.8f);
 			a_Player->UseEquippedItem();
 			return true;

src/Simulator/SandSimulator.cpp

@@ -160,6 +160,7 @@ bool cSandSimulator::CanContinueFallThrough(BLOCKTYPE a_BlockType)
 		case E_BLOCK_FIRE:
 		case E_BLOCK_FLOWER_POT:
 		case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
+		case E_BLOCK_IRON_TRAPDOOR:
 		case E_BLOCK_LAVA:
 		case E_BLOCK_LEVER:
 		case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:

src/World.cpp

@@ -2954,7 +2954,7 @@ bool cWorld::IsTrapdoorOpen(int a_BlockX, int a_BlockY, int a_BlockZ)
 	BLOCKTYPE Block;
 	NIBBLETYPE Meta;
 	GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, Meta);
-	if (Block != E_BLOCK_TRAPDOOR)
+	if ((Block != E_BLOCK_TRAPDOOR) && (Block != E_BLOCK_IRON_TRAPDOOR))
 	{
 		return false;
 	}
@@ -2971,7 +2971,7 @@ bool cWorld::SetTrapdoorOpen(int a_BlockX, int a_BlockY, int a_BlockZ, bool a_Op
 	BLOCKTYPE Block;
 	NIBBLETYPE Meta;
 	GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, Meta);
-	if (Block != E_BLOCK_TRAPDOOR)
+	if ((Block != E_BLOCK_TRAPDOOR) && (Block != E_BLOCK_IRON_TRAPDOOR))
 	{
 		return false;
 	}