7 files changed, 33 insertions, 10 deletions

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index f75e23d8b..5a9217c9e 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -413,8 +413,10 @@ void cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cEmptyMinecart:
 
-cEmptyMinecart::cEmptyMinecart(double a_X, double a_Y, double a_Z) :
-	super(mpNone, a_X, a_Y, a_Z)
+cEmptyMinecart::cEmptyMinecart(double a_X, double a_Y, double a_Z, const cItem & a_Content, int a_Height) :
+	super(mpNone, a_X, a_Y, a_Z),
+	m_Content(a_Content),
+	m_Height(a_Height)
 {
 }
 
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index b1b48be4e..87d375c68 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -77,10 +77,16 @@ class cEmptyMinecart :
 public:
 	CLASS_PROTODEF(cEmptyMinecart);
 	
-	cEmptyMinecart(double a_X, double a_Y, double a_Z);
+	cEmptyMinecart(double a_X, double a_Y, double a_Z, const cItem & a_Content, int a_Height);
 
+	cItem GetContent(void)   const {return m_Content;}
+	int GetBlockHeight(void) const {return m_Height;}
 	// cEntity overrides:
 	virtual void OnRightClicked(cPlayer & a_Player) override;
+protected:
+
+	const cItem & m_Content;
+	int m_Height; 
 } ;
 
 
diff --git a/src/Items/ItemMinecart.h b/src/Items/ItemMinecart.h
index f8eb31a49..b82779026 100644
--- a/src/Items/ItemMinecart.h
+++ b/src/Items/ItemMinecart.h
@@ -60,7 +60,7 @@ public:
 		cMinecart * Minecart = NULL;
 		switch (m_ItemType)
 		{
-			case E_ITEM_MINECART:             Minecart = new cEmptyMinecart        (x, y, z); break;
+			case E_ITEM_MINECART:             Minecart = new cEmptyMinecart        (x, y, z, cItem(), 1); break;
 			case E_ITEM_CHEST_MINECART:       Minecart = new cMinecartWithChest    (x, y, z); break;
 			case E_ITEM_FURNACE_MINECART:     Minecart = new cMinecartWithFurnace  (x, y, z); break;
 			case E_ITEM_MINECART_WITH_TNT:    Minecart = new cMinecartWithTNT      (x, y, z); break;
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 9c46c6843..8e397358f 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1781,7 +1781,22 @@ void cProtocol172::cPacketizer::WriteEntityMetadata(const cEntity & a_Entity)
 			WriteInt(1); // Shaking direction, doesn't seem to affect anything
 			WriteByte(0x73);
 			WriteFloat((float)(((const cMinecart &)a_Entity).LastDamage() + 10)); // Damage taken / shake effect multiplyer
-
+			
+			if (((cMinecart &)a_Entity).GetPayload() == cMinecart::mpNone)
+			{
+				cEmptyMinecart EmptyMinecart = ((cEmptyMinecart &)a_Entity);
+				if (!EmptyMinecart.GetContent().IsEmpty())
+				{
+					WriteByte(0x54);
+					int Content = EmptyMinecart.GetContent().m_ItemType;
+					Content |= EmptyMinecart.GetContent().m_ItemDamage << 8;
+					WriteInt(Content);
+					WriteByte(0x55);
+					WriteInt(EmptyMinecart.GetBlockHeight());
+					WriteByte(0x56);
+					WriteByte(1);
+				}
+			}
 			if (((cMinecart &)a_Entity).GetPayload() == cMinecart::mpFurnace)
 			{
 				WriteByte(0x10);
diff --git a/src/World.cpp b/src/World.cpp
index b5599c660..d7edbe3f8 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1648,23 +1648,23 @@ int cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward)
 
 
 
-int cWorld::SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType)
+int cWorld::SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType, cItem a_Content, int a_BlockHeight)
 {
 	cMinecart * Minecart;
 	switch (a_MinecartType)
 	{
-		case E_ITEM_MINECART:             Minecart = new cEmptyMinecart        (a_X, a_Y, a_Z); break;
+		case E_ITEM_MINECART:             Minecart = new cEmptyMinecart        (a_X, a_Y, a_Z, a_Content, a_BlockHeight); break;
 		case E_ITEM_CHEST_MINECART:       Minecart = new cMinecartWithChest    (a_X, a_Y, a_Z); break;
 		case E_ITEM_FURNACE_MINECART:     Minecart = new cMinecartWithFurnace  (a_X, a_Y, a_Z); break;
 		case E_ITEM_MINECART_WITH_TNT:    Minecart = new cMinecartWithTNT      (a_X, a_Y, a_Z); break;
 		case E_ITEM_MINECART_WITH_HOPPER: Minecart = new cMinecartWithHopper   (a_X, a_Y, a_Z); break;
 		default:
 		{
-			ASSERT(!"Unhandled minecart item");
 			return -1;
 		}
 	}  // switch (a_MinecartType)
 	Minecart->Initialize(this);
+	return Minecart->GetUniqueID();
 }
 
 
diff --git a/src/World.h b/src/World.h
index 89a236b62..23b125e67 100644
--- a/src/World.h
+++ b/src/World.h
@@ -364,7 +364,7 @@ public:
 	int SpawnFallingBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE BlockType, NIBBLETYPE BlockMeta);
 
 	/// Spawns an minecart at the given coordinates.
-	int SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType);
+	int SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType, cItem a_Content = cItem(), int a_BlockHeight = 1);
 
 	/// Spawns an experience orb at the given location with the given reward. It returns the UniqueID of the spawned experience orb.
 	int SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward);
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 8605930b6..4fac1bd8d 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1150,7 +1150,7 @@ void cWSSAnvil::LoadFallingBlockFromNBT(cEntityList & a_Entities, const cParsedN
 
 void cWSSAnvil::LoadMinecartRFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
 {
-	std::auto_ptr<cEmptyMinecart> Minecart(new cEmptyMinecart(0, 0, 0));
+	std::auto_ptr<cEmptyMinecart> Minecart(new cEmptyMinecart(0, 0, 0, cItem(), 1)); // TODO: Load the block and the height
 	if (!LoadEntityBaseFromNBT(*Minecart.get(), a_NBT, a_TagIdx))
 	{
 		return;