4 files changed, 191 insertions, 132 deletions

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index 69a3a817c..095865d07 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -767,6 +767,7 @@ public:
 		g_BlockIsSolid[E_BLOCK_MELON_STEM]            = false;
 		g_BlockIsSolid[E_BLOCK_NETHER_PORTAL]         = false;
 		g_BlockIsSolid[E_BLOCK_PISTON_EXTENSION]      = false;
+		g_BlockIsSolid[E_BLOCK_POWERED_RAIL]          = false;
 		g_BlockIsSolid[E_BLOCK_RAIL]                  = false;
 		g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_OFF]    = false;
 		g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_ON]     = false;
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 8a74c9da4..fbf76e008 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -321,7 +321,10 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		m_Health = 0;
 	}
 
-	AddSpeed(a_TDI.Knockback * 2);
+	if (IsMob() || IsPlayer()) // Knockback for only players and mobs
+	{
+		AddSpeed(a_TDI.Knockback * 2);
+	}
 
 	m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_HURT);
 
diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index f75e23d8b..710e033f0 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -11,6 +11,9 @@
 #include "../Chunk.h"
 #include "Player.h"
 
+#define MAX_SPEED 8
+#define MAX_SPEED_NEGATIVE -MAX_SPEED
+
 
 
 
@@ -70,286 +73,329 @@ void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 		// Inside an unloaded chunk, bail out all processing
 		return;
 	}
-	BLOCKTYPE BelowType = Chunk->GetBlock(RelPosX, PosY - 1, RelPosZ);
-	BLOCKTYPE InsideType = Chunk->GetBlock(RelPosX, PosY, RelPosZ);
 
-	if (IsBlockRail(BelowType))
+	BLOCKTYPE InsideType;
+	NIBBLETYPE InsideMeta;
+	Chunk->GetBlockTypeMeta(RelPosX, PosY, RelPosZ, InsideType, InsideMeta);
+
+	if (!IsBlockRail(InsideType))
 	{
-		HandleRailPhysics(a_Dt, *Chunk);
+		Chunk->GetBlockTypeMeta(RelPosX, PosY + 1, RelPosZ, InsideType, InsideMeta);
+		if (IsBlockRail(InsideType)) AddPosY(1);
 	}
-	else
+
+	if (IsBlockRail(InsideType))
 	{
-		if (IsBlockRail(InsideType))
-		{
-			SetPosY(PosY + 1);
-			HandleRailPhysics(a_Dt, *Chunk);
-		}
-		else
+		SnapToRail(InsideMeta);
+
+		switch (InsideType)
 		{
-			super::HandlePhysics(a_Dt, *Chunk);
-			BroadcastMovementUpdate();
+			case E_BLOCK_RAIL: HandleRailPhysics(InsideMeta); break;
+			case E_BLOCK_DETECTOR_RAIL: break;
+			case E_BLOCK_ACTIVATOR_RAIL: break;
+			case E_BLOCK_POWERED_RAIL: HandlePoweredRailPhysics(InsideMeta); break;
+			default: VERIFY(!"Unhandled rail type despite checking if block was rail!"); break;
 		}
+
+		AddPosition(GetSpeed() * (a_Dt / 1000));
+	}
+	else
+	{
+		SetPosY(floor(GetPosY()) + 0.35); // HandlePhysics overrides this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail
+		super::HandlePhysics(a_Dt, *Chunk);
 	}
+	
+	BroadcastMovementUpdate();
 }
 
 
 
 
 
-static const double MAX_SPEED = 8;
-static const double MAX_SPEED_NEGATIVE = (0 - MAX_SPEED);
-
-void cMinecart::HandleRailPhysics(float a_Dt, cChunk & a_Chunk)
+void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta)
 {
-	
-	super::HandlePhysics(a_Dt, a_Chunk); // Main physics handling
-
 	/*
 	NOTE: Please bear in mind that taking away from negatives make them even more negative,
 	adding to negatives make them positive, etc.
 	*/
 	
-	// Get block meta below the cart
-	int RelPosX = (int)floor(GetPosX()) - a_Chunk.GetPosX() * cChunkDef::Width;
-	int RelPosZ = (int)floor(GetPosZ()) - a_Chunk.GetPosZ() * cChunkDef::Width;
-	NIBBLETYPE BelowMeta = a_Chunk.GetMeta(RelPosX, (int)floor(GetPosY() - 1), RelPosZ);
-	double SpeedX = GetSpeedX(), SpeedY = GetSpeedY(), SpeedZ = GetSpeedZ(); // Get current speed
-	
-	switch (BelowMeta)
+	switch (a_RailMeta)
 	{
 		case E_META_RAIL_ZM_ZP: // NORTHSOUTH
 		{
 			SetRotation(270);
-			SpeedY = 0; // Don't move vertically as on ground
-			SpeedX = 0; // Correct diagonal movement from curved rails
+			SetPosY(floor(GetPosY()) + 0.55);
+			SetSpeedY(0); // Don't move vertically as on ground
+			SetSpeedX(0); // Correct diagonal movement from curved rails
 			
-			if (SpeedZ != 0) // Don't do anything if cart is stationary
+			if (GetSpeedZ() != 0) // Don't do anything if cart is stationary
 			{
-				if (SpeedZ > 0)
+				if (GetSpeedZ() > 0)
 				{
 					// Going SOUTH, slow down
-					SpeedZ = SpeedZ - 0.1;
+					AddSpeedZ(-0.1);
 				}
 				else
 				{
 					// Going NORTH, slow down
-					SpeedZ = SpeedZ + 0.1;
+					AddSpeedZ(0.1);
 				}
 			}
 			break;
 		}
-
 		case E_META_RAIL_XM_XP: // EASTWEST
 		{
 			SetRotation(180);
-			SpeedY = 0;
-			SpeedZ = 0;
+			SetPosY(floor(GetPosY()) + 0.55);
+			SetSpeedY(0);
+			SetSpeedZ(0);
 
-			if (SpeedX != 0)
+			if (GetSpeedX() != 0)
 			{
-				if (SpeedX > 0)
+				if (GetSpeedX() > 0)
 				{
-					SpeedX = SpeedX - 0.1;
+					AddSpeedX(-0.1);
 				}
 				else
 				{
-					SpeedX = SpeedX + 0.1;
+					AddSpeedX(0.1);
 				}
 			}
 			break;
 		}
-
 		case E_META_RAIL_ASCEND_ZM: // ASCEND NORTH
 		{
 			SetRotation(270);
-			SetPosY(floor(GetPosY()) + 0.2); // It seems it doesn't work without levitation :/
-			SpeedX = 0;
+			SetSpeedX(0);
 
-			if (SpeedZ >= 0)
+			if (GetSpeedZ() >= 0)
 			{
 				// SpeedZ POSITIVE, going SOUTH
-				if (SpeedZ <= MAX_SPEED) // Speed limit
+				if (GetSpeedZ() <= MAX_SPEED) // Speed limit
 				{
-					SpeedZ = SpeedZ + 0.5; // Speed up
-					SpeedY = (0 - SpeedZ); // Downward movement is negative (0 minus positive numbers is negative)
-				}
-				else
-				{
-					SpeedZ = MAX_SPEED; // Enforce speed limit
-					SpeedY = (0 - SpeedZ);
+					AddSpeedZ(0.5); // Speed up
+					SetSpeedY(-GetSpeedZ()); // Downward movement is negative (0 minus positive numbers is negative)
 				}
 			}
 			else
 			{
 				// SpeedZ NEGATIVE, going NORTH
-				SpeedZ = SpeedZ + 0.4; // Slow down
-				SpeedY = (0 - SpeedZ); // Upward movement is positive (0 minus negative number is positive number)
+				AddSpeedZ(1); // Slow down
+				SetSpeedY(-GetSpeedZ()); // Upward movement is positive (0 minus negative number is positive number)
 			}
 			break;
 		}
-
 		case E_META_RAIL_ASCEND_ZP: // ASCEND SOUTH
 		{
 			SetRotation(270);
-			SetPosY(floor(GetPosY()) + 0.2);
-			SpeedX = 0;
+			SetSpeedX(0);
 
-			if (SpeedZ > 0)
+			if (GetSpeedZ() > 0)
 			{
 				// SpeedZ POSITIVE, going SOUTH
-				SpeedZ = SpeedZ - 0.4; // Slow down
-				SpeedY = SpeedZ; // Upward movement positive
+				AddSpeedZ(-1); // Slow down
+				SetSpeedY(GetSpeedZ()); // Upward movement positive
 			}
 			else
 			{
-				if (SpeedZ >= MAX_SPEED_NEGATIVE) // Speed limit
+				if (GetSpeedZ() >= MAX_SPEED_NEGATIVE) // Speed limit
 				{
 					// SpeedZ NEGATIVE, going NORTH
-					SpeedZ = SpeedZ - 0.5; // Speed up
-					SpeedY = SpeedZ; // Downward movement negative
-				}
-				else
-				{
-					SpeedZ = MAX_SPEED_NEGATIVE; // Enforce speed limit
-					SpeedY = SpeedZ;
+					AddSpeedZ(-0.5); // Speed up
+					SetSpeedY(GetSpeedZ()); // Downward movement negative
 				}
 			}
 			break;
 		}
-
 		case E_META_RAIL_ASCEND_XM: // ASCEND EAST
 		{
 			SetRotation(180);
-			SetPosY(floor(GetPosY()) + 0.2);
-			SpeedZ = 0;
+			SetSpeedZ(0);
 
-			if (SpeedX >= 0)
+			if (GetSpeedX() >= 0)
 			{
-				if (SpeedX <= MAX_SPEED)
-				{
-					SpeedX = SpeedX + 0.5;
-					SpeedY = (0 - SpeedX);
-				}
-				else
+				if (GetSpeedX() <= MAX_SPEED)
 				{
-					SpeedX = MAX_SPEED;
-					SpeedY = (0 - SpeedX);
+					AddSpeedX(0.5);
+					SetSpeedY(-GetSpeedX());
 				}
 			}
 			else
 			{
-				SpeedX = SpeedX + 0.4;
-				SpeedY = (0 - SpeedX);
+				AddSpeedX(1);
+				SetSpeedY(-GetSpeedX());
 			}
 			break;
 		}
-
 		case E_META_RAIL_ASCEND_XP: // ASCEND WEST
 		{
 			SetRotation(180);
-			SetPosY(floor(GetPosY()) + 0.2);
-			SpeedZ = 0;
+			SetSpeedZ(0);
 
-			if (SpeedX > 0)
+			if (GetSpeedX() > 0)
 			{
-				SpeedX = SpeedX - 0.4;
-				SpeedY = SpeedX;
+				AddSpeedX(-1);
+				SetSpeedY(GetSpeedX());
 			}
 			else
 			{
-				if (SpeedX >= MAX_SPEED_NEGATIVE)
-				{
-					SpeedX = SpeedX - 0.5;
-					SpeedY = SpeedX;
-				}
-				else
+				if (GetSpeedX() >= MAX_SPEED_NEGATIVE)
 				{
-					SpeedX = MAX_SPEED_NEGATIVE;
-					SpeedY = SpeedX;
+					AddSpeedX(-0.5);
+					SetSpeedY(GetSpeedX());
 				}
 			}
 			break;
 		}
-
 		case E_META_RAIL_CURVED_ZM_XM: // Ends pointing NORTH and WEST
 		{
 			SetRotation(315); // Set correct rotation server side
-			SetPosY(floor(GetPosY()) + 0.2); // Levitate dat cart
+			SetPosY(floor(GetPosY()) + 0.3); // Levitate dat cart
 
-			if (SpeedZ > 0) // Cart moving south
+			if (GetSpeedZ() > 0) // Cart moving south
 			{
-				SpeedX = (0 - SpeedZ); // Diagonally move southwest (which will make cart hit a southwest rail)
+				SetSpeedX(-GetSpeedZ()); // Diagonally move southwest (which will make cart hit a southwest rail)
 			}
-			else if (SpeedX > 0) // Cart moving east
+			else if (GetSpeedX() > 0) // Cart moving east
 			{
-				SpeedZ = (0 - SpeedX); // Diagonally move northeast
+				SetSpeedZ(-GetSpeedX()); // Diagonally move northeast
 			}
 			break;
 		}
-
 		case E_META_RAIL_CURVED_ZM_XP: // Curved NORTH EAST
 		{
 			SetRotation(225);
-			SetPosY(floor(GetPosY()) + 0.2);
+			SetPosY(floor(GetPosY()) + 0.3);
 
-			if (SpeedZ > 0)
+			if (GetSpeedZ() > 0)
 			{
-				SpeedX = SpeedZ;
+				SetSpeedX(GetSpeedZ());
 			}
-			else if (SpeedX < 0)
+			else if (GetSpeedX() < 0)
 			{
-				SpeedZ = SpeedX;
+				SetSpeedZ(GetSpeedX());
 			}
 			break;
 		}
-
 		case E_META_RAIL_CURVED_ZP_XM: // Curved SOUTH WEST
 		{
 			SetRotation(135);
-			SetPosY(floor(GetPosY()) + 0.2);
+			SetPosY(floor(GetPosY()) + 0.3);
 
-			if (SpeedZ < 0)
+			if (GetSpeedZ() < 0)
 			{
-				SpeedX = SpeedZ;
+				SetSpeedX(GetSpeedZ());
 			}
-			else if (SpeedX > 0)
+			else if (GetSpeedX() > 0)
 			{
-				SpeedZ = SpeedX;
+				SetSpeedZ(GetSpeedX());
 			}
 			break;
 		}
-
 		case E_META_RAIL_CURVED_ZP_XP: // Curved SOUTH EAST
 		{
 			SetRotation(45);
-			SetPosY(floor(GetPosY()) + 0.2);
+			SetPosY(floor(GetPosY()) + 0.3);
 
-			if (SpeedZ < 0)
+			if (GetSpeedZ() < 0)
 			{
-				SpeedX = (0 - SpeedZ);
+				SetSpeedX(-GetSpeedZ());
 			}
-			else if (SpeedX < 0)
+			else if (GetSpeedX() < 0)
 			{
-				SpeedZ = (0 - SpeedX);
+				SetSpeedZ(-GetSpeedX());
 			}
 			break;
 		}
-
 		default:
 		{
 			ASSERT(!"Unhandled rail meta!"); // Dun dun DUN!
 			break;
 		}
 	}
+}
 
-	// Set speed to speed variables
-	SetSpeedX(SpeedX);
-	SetSpeedY(SpeedY);
-	SetSpeedZ(SpeedZ);
 
 
-	// Broadcast position to client
-	BroadcastMovementUpdate();
+
+void cMinecart::HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta)
+{
+	if ((a_RailMeta & 0x8) == 0x8)
+	{
+		switch (a_RailMeta & 0x07)
+		{
+			case E_META_RAIL_ZM_ZP: // NORTHSOUTH
+			{
+				SetRotation(270);
+				SetPosY(floor(GetPosY()) + 0.55);
+				SetSpeedY(0); // Don't move vertically as on ground
+				SetSpeedX(0); // Correct diagonal movement from curved rails
+			
+				if (GetSpeedZ() != 0) // Don't do anything if cart is stationary
+				{
+					if (GetSpeedZ() > 0)
+					{
+						// Going SOUTH, slow down
+						AddSpeedZ(1);
+					}
+					else
+					{
+						// Going NORTH, slow down
+						AddSpeedZ(-1);
+					}
+				}
+				break;
+			}
+			case E_META_RAIL_XM_XP: // EASTWEST
+			{
+				SetRotation(180);
+				SetPosY(floor(GetPosY()) + 0.55);
+				SetSpeedY(0);
+				SetSpeedZ(0);
+
+				if (GetSpeedX() != 0)
+				{
+					if (GetSpeedX() > 0)
+					{
+						AddSpeedX(-1);
+					}
+					else
+					{
+						AddSpeedX(1);
+					}
+				}
+				break;
+			}
+		}
+	}
+}
+
+
+
+
+
+void cMinecart::SnapToRail(NIBBLETYPE a_RailMeta)
+{
+	switch (a_RailMeta)
+	{
+		case E_META_RAIL_ASCEND_XM:
+		case E_META_RAIL_ASCEND_XP:
+		case E_META_RAIL_XM_XP:
+		{
+			SetSpeedZ(0);
+			SetPosZ(floor(GetPosZ()) + 0.3);
+			break;
+		}
+		case E_META_RAIL_ASCEND_ZM:
+		case E_META_RAIL_ASCEND_ZP:
+		case E_META_RAIL_ZM_ZP:
+		{
+			SetSpeedX(0);
+			SetPosX(floor(GetPosX()) + 0.3);
+			break;
+		}
+		default: break;
+	}
 }
 
 
@@ -358,6 +404,14 @@ void cMinecart::HandleRailPhysics(float a_Dt, cChunk & a_Chunk)
 
 void cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
 {
+	if (TDI.Attacker->IsPlayer() && ((cPlayer *)TDI.Attacker)->IsGameModeCreative())
+	{
+		Destroy();
+		TDI.FinalDamage = GetMaxHealth(); // Instant hit for creative
+		super::DoTakeDamage(TDI);
+		return; // No drops for creative
+	}
+
 	m_LastDamage = TDI.FinalDamage;
 	super::DoTakeDamage(TDI);
 
@@ -365,7 +419,7 @@ void cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
 
 	if (GetHealth() <= 0)
 	{
-		Destroy(true);
+		Destroy();
 		
 		cItems Drops;
 		switch (m_Payload)
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index b1b48be4e..e353e18d9 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -53,15 +53,16 @@ public:
 	virtual void DoTakeDamage(TakeDamageInfo & TDI) override;
 	
 	int LastDamage(void) const { return m_LastDamage; }
-	void HandleRailPhysics(float a_Dt, cChunk & a_Chunk);
 	ePayload GetPayload(void) const { return m_Payload; }
 	
 protected:
 	ePayload m_Payload;
+	int m_LastDamage;
 	
 	cMinecart(ePayload a_Payload, double a_X, double a_Y, double a_Z);
-
-	int m_LastDamage;
+	void HandleRailPhysics(NIBBLETYPE a_RailMeta);
+	void HandlePoweredRailPhysics(NIBBLETYPE a_RailMeta);
+	void SnapToRail(NIBBLETYPE a_RailMeta);
 
 } ;