Merge pull request #704 from Howaner/GlobalFixes

Global fixes

src/BlockID.cpp

@@ -644,9 +644,11 @@ public:
 		g_BlockPistonBreakable[E_BLOCK_DEAD_BUSH]             = true;
 		g_BlockPistonBreakable[E_BLOCK_FIRE]                  = true;
 		g_BlockPistonBreakable[E_BLOCK_FLOWER]                = true;
+		g_BlockPistonBreakable[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE] = true;
 		g_BlockPistonBreakable[E_BLOCK_INACTIVE_COMPARATOR]   = true;
 		g_BlockPistonBreakable[E_BLOCK_IRON_DOOR]             = true;
 		g_BlockPistonBreakable[E_BLOCK_JACK_O_LANTERN]        = true;
+		g_BlockPistonBreakable[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE] = true;
 		g_BlockPistonBreakable[E_BLOCK_LADDER]                = true;
 		g_BlockPistonBreakable[E_BLOCK_LAVA]                  = true;
 		g_BlockPistonBreakable[E_BLOCK_LEVER]                 = true;
@@ -727,10 +729,12 @@ public:
 		g_BlockRequiresSpecialTool[E_BLOCK_END_STONE]            = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_GOLD_BLOCK]           = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_GOLD_ORE]             = true;
+		g_BlockRequiresSpecialTool[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE] = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_IRON_BLOCK]           = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_IRON_ORE]             = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_LAPIS_BLOCK]          = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_LAPIS_ORE]            = true;
+		g_BlockRequiresSpecialTool[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE] = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_MOSSY_COBBLESTONE]    = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_NETHERRACK]           = true;
 		g_BlockRequiresSpecialTool[E_BLOCK_NETHER_BRICK]         = true;

src/Blocks/BlockCauldron.h

@@ -21,24 +21,30 @@ public:
 		a_Pickups.push_back(cItem(E_ITEM_CAULDRON, 1, 0));
 	}
 
-	void OnUse(cChunkInterface * a_ChunkInterface, cWorldInterface * a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ)
+	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
 	{
-		char Meta = a_ChunkInterface->GetBlockMeta( a_BlockX, a_BlockY, a_BlockZ );
+		char Meta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
-		switch( a_Player->GetEquippedItem().m_ItemType )
+		switch (a_Player->GetEquippedItem().m_ItemType)
 		{
 			case E_ITEM_WATER_BUCKET:
 			{
-				a_ChunkInterface->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, 3 );
+				if (Meta < 3)
-				a_Player->GetInventory().RemoveOneEquippedItem();
+				{
-				cItem NewItem(E_ITEM_BUCKET, 1);
+					a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, 3);
-				a_Player->GetInventory().AddItem(NewItem);
+					if (!a_Player->IsGameModeCreative())
+					{
+						a_Player->GetInventory().RemoveOneEquippedItem();
+						cItem NewItem(E_ITEM_BUCKET, 1);
+						a_Player->GetInventory().AddItem(NewItem);
+					}
+				}
 				break;
 			}
 			case E_ITEM_GLASS_BOTTLE:
 			{
-				if( Meta > 0 )
+				if (Meta > 0)
 				{
-					a_ChunkInterface->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, --Meta);
+					a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, --Meta);
 					a_Player->GetInventory().RemoveOneEquippedItem();
 					cItem NewItem(E_ITEM_POTIONS, 1, 0);
 					a_Player->GetInventory().AddItem(NewItem);

src/Mobs/Wolf.cpp

@@ -4,6 +4,7 @@
 #include "Wolf.h"
 #include "../World.h"
 #include "../Entities/Player.h"
+#include "../Items/ItemHandler.h"
 
 
 
@@ -86,23 +87,44 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
 	}
 	else if (IsTame())
 	{
-		if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
+		switch (a_Player.GetEquippedItem().m_ItemType)
 		{
-			if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE)
+			case E_ITEM_RAW_BEEF:
+			case E_ITEM_STEAK:
+			case E_ITEM_RAW_PORKCHOP:
+			case E_ITEM_COOKED_PORKCHOP:
+			case E_ITEM_RAW_CHICKEN:
+			case E_ITEM_COOKED_CHICKEN:
+			case E_ITEM_ROTTEN_FLESH:
 			{
-				SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
+				if (m_Health < m_MaxHealth)
-				if (!a_Player.IsGameModeCreative())
 				{
-					a_Player.GetInventory().RemoveOneEquippedItem();
+					Heal(ItemHandler(a_Player.GetEquippedItem().m_ItemType)->GetFoodInfo().FoodLevel);
+					if (!a_Player.IsGameModeCreative())
+					{
+						a_Player.GetInventory().RemoveOneEquippedItem();
+					}
 				}
-			} 
+				break;
-			else if (IsSitting()) 
-			{
-				SetIsSitting(false);
 			}
-			else
+			case E_ITEM_DYE:
 			{
-				SetIsSitting(true);
+				if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
+				{
+					SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
+					if (!a_Player.IsGameModeCreative())
+					{
+						a_Player.GetInventory().RemoveOneEquippedItem();
+					}
+				}
+				break;
+			}
+			default:
+			{
+				if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
+				{
+					SetIsSitting(!IsSitting());
+				}
 			}
 		}
 	}
@@ -136,6 +158,8 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
 			case E_ITEM_RAW_CHICKEN:
 			case E_ITEM_COOKED_CHICKEN:
 			case E_ITEM_ROTTEN_FLESH:
+			case E_ITEM_RAW_PORKCHOP:
+			case E_ITEM_COOKED_PORKCHOP:
 			{
 				if (!IsBegging())
 				{

src/Simulator/FireSimulator.cpp

@@ -169,6 +169,7 @@ bool cFireSimulator::IsFuel(BLOCKTYPE a_BlockType)
 		case E_BLOCK_FENCE:
 		case E_BLOCK_TNT:
 		case E_BLOCK_VINES:
+		case E_BLOCK_HAY_BALE:
 		{
 			return true;
 		}

src/Simulator/IncrementalRedstoneSimulator.cpp

@@ -6,6 +6,7 @@
 #include "../BlockEntities/NoteEntity.h"
 #include "../BlockEntities/CommandBlockEntity.h"
 #include "../Entities/TNTEntity.h"
+#include "../Entities/Pickup.h"
 #include "../Blocks/BlockTorch.h"
 #include "../Blocks/BlockDoor.h"
 #include "../Piston.h"
@@ -87,7 +88,8 @@ void cIncrementalRedstoneSimulator::RedstoneAddBlock(int a_BlockX, int a_BlockY,
 			((Block == E_BLOCK_LEVER) && !IsLeverOn(Meta)) ||
 			((Block == E_BLOCK_DETECTOR_RAIL) && (Meta & 0x08) == 0) ||
 			(((Block == E_BLOCK_STONE_BUTTON) || (Block == E_BLOCK_WOODEN_BUTTON)) && (!IsButtonOn(Meta))) ||
-			(((Block == E_BLOCK_STONE_PRESSURE_PLATE) || (Block == E_BLOCK_WOODEN_PRESSURE_PLATE)) && (Meta == 0))
+			(((Block == E_BLOCK_STONE_PRESSURE_PLATE) || (Block == E_BLOCK_WOODEN_PRESSURE_PLATE)) && (Meta == 0)) ||
+			(((Block == E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE) || (Block == E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE)) && (Meta == 0))
 			)
 		{
 			LOGD("cIncrementalRedstoneSimulator: Erased block @ {%i, %i, %i} from powered blocks list due to present/past metadata mismatch", itr->a_BlockPos.x, itr->a_BlockPos.y, itr->a_BlockPos.z);
@@ -313,6 +315,8 @@ void cIncrementalRedstoneSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int
 			}
 			case E_BLOCK_WOODEN_PRESSURE_PLATE:
 			case E_BLOCK_STONE_PRESSURE_PLATE:
+			case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:
+			case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
 			{
 				HandlePressurePlate(a_X, dataitr->y, a_Z, dataitr->Data);
 				break;
@@ -333,13 +337,13 @@ void cIncrementalRedstoneSimulator::WakeUp(int a_BlockX, int a_BlockY, int a_Blo
 		((a_BlockX % cChunkDef::Width) >= 14) ||
 		((a_BlockZ % cChunkDef::Width) <= 1) ||
 		((a_BlockZ % cChunkDef::Width) >= 14)
-		) // Are we on a chunk boundary? ± 2 because of LinkedPowered blocks
+		) // Are we on a chunk boundary? ± 2 because of LinkedPowered blocks
 	{
 		// On a chunk boundary, alert all four sides (i.e. at least one neighbouring chunk)
 		AddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk);
 
 		// Pass the original coordinates, because when adding things to our simulator lists, we get the chunk that they are in, and therefore any updates need to preseve their position
-		// RedstoneAddBlock to pass both the neighbouring chunk and the chunk which the coordiantes are in and ± 2 in GetNeighbour() to accomodate for LinkedPowered blocks being 2 away from chunk boundaries
+		// RedstoneAddBlock to pass both the neighbouring chunk and the chunk which the coordiantes are in and ± 2 in GetNeighbour() to accomodate for LinkedPowered blocks being 2 away from chunk boundaries
 		RedstoneAddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk->GetNeighborChunk(a_BlockX - 2, a_BlockZ), a_Chunk);
 		RedstoneAddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk->GetNeighborChunk(a_BlockX + 2, a_BlockZ), a_Chunk);
 		RedstoneAddBlock(a_BlockX, a_BlockY, a_BlockZ, a_Chunk->GetNeighborChunk(a_BlockX, a_BlockZ - 2), a_Chunk);
@@ -1039,13 +1043,15 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_Bloc
 			}
 			break;
 		}
+		case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:
+		case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
 		case E_BLOCK_WOODEN_PRESSURE_PLATE:
 		{
-			class cWoodenPressurePlateCallback :
+			class cPressurePlateCallback :
 				public cEntityCallback
 			{
 			public:
-				cWoodenPressurePlateCallback(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
+				cPressurePlateCallback(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
 					m_Entity(NULL),
 					m_World(a_World),
 					m_X(a_BlockX),
@@ -1063,7 +1069,7 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_Bloc
 					if (Distance <= 0.7)
 					{
 						m_Entity = a_Entity;
-						return true; // Break out, we only need to know for wooden plates that at least one entity is on top
+						return true; // Break out, we only need to know for plates that at least one entity is on top
 					}
 					return false;
 				}
@@ -1082,16 +1088,25 @@ void cIncrementalRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_Bloc
 				int m_Z;
 			} ;
 
-			cWoodenPressurePlateCallback WoodenPressurePlateCallback(a_BlockX, a_BlockY, a_BlockZ, &m_World);
+			cPressurePlateCallback PressurePlateCallback(a_BlockX, a_BlockY, a_BlockZ, &m_World);
-			m_World.ForEachEntity(WoodenPressurePlateCallback);
+			m_World.ForEachEntity(PressurePlateCallback);
 
-			if (WoodenPressurePlateCallback.FoundEntity())
+			NIBBLETYPE Meta = m_World.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
+			if (PressurePlateCallback.FoundEntity())
 			{
+				if (Meta == 0x0)
+				{
+					m_World.BroadcastSoundEffect("random.click", (int) ((a_BlockX + 0.5) * 8.0), (int) ((a_BlockY + 0.1) * 8.0), (int) ((a_BlockZ + 0.5) * 8.0), 0.3F, 0.5F);
+				}
 				m_World.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, 0x1);
-				SetAllDirsAsPowered(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WOODEN_PRESSURE_PLATE);
+				SetAllDirsAsPowered(a_BlockX, a_BlockY, a_BlockZ, a_MyType);
 			}
 			else
 			{
+				if (Meta == 0x1)
+				{
+					m_World.BroadcastSoundEffect("random.click", (int) ((a_BlockX + 0.5) * 8.0), (int) ((a_BlockY + 0.1) * 8.0), (int) ((a_BlockZ + 0.5) * 8.0), 0.3F, 0.6F);
+				}
 				m_World.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, 0x0);
 				m_World.WakeUpSimulators(a_BlockX, a_BlockY, a_BlockZ);
 			}

src/Simulator/SandSimulator.cpp

@@ -158,8 +158,10 @@ bool cSandSimulator::CanContinueFallThrough(BLOCKTYPE a_BlockType)
 		case E_BLOCK_DETECTOR_RAIL:
 		case E_BLOCK_FIRE:
 		case E_BLOCK_FLOWER_POT:
+		case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
 		case E_BLOCK_LAVA:
 		case E_BLOCK_LEVER:
+		case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:
 		case E_BLOCK_MINECART_TRACKS:
 		case E_BLOCK_MELON_STEM:
 		case E_BLOCK_POWERED_RAIL: