5 files changed, 43 insertions, 22 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5029906aa..52a792ba7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,6 +59,7 @@ if (NOT MSVC)
 		Entities/Player.h
 		Entities/ProjectileEntity.h
 		Entities/TNTEntity.h
+		Entities/ExpOrb.h
 		Generating/ChunkDesc.h
 		Group.h
 		Inventory.h
diff --git a/src/Entities/ExpOrb.h b/src/Entities/ExpOrb.h
index b75859e4c..c1150bd03 100644
--- a/src/Entities/ExpOrb.h
+++ b/src/Entities/ExpOrb.h
@@ -7,30 +7,33 @@
 
 
 
+// tolua_begin
 class cExpOrb :
 	public cEntity
 {
 	typedef cExpOrb super;
 	
 public:
+	// tolua_end
+
 	CLASS_PROTODEF(cExpOrb);
-	
+
 	cExpOrb(double a_X, double a_Y, double a_Z, int a_Reward);
 	cExpOrb(const Vector3d & a_Pos, int a_Reward);
 
 	// Override functions
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void SpawnOn(cClientHandle & a_Client) override;
-	
+
 	/** Returns the number of ticks that this entity has existed */
-	int GetAge(void) const { return (int)(m_Timer / 50); }  // tolua_export
-	
+	int GetAge(void) const { return (int)(m_Timer / 50); }     // tolua_export
+
 	/** Set the number of ticks that this entity has existed */
 	void SetAge(int a_Age) { m_Timer = (float)(a_Age * 50); }  // tolua_export
 
 	/** Get the exp amount */
 	int GetReward(void) const { return m_Reward; }  // tolua_export
-	
+
 	/** Set the exp amount */
 	void SetReward(int a_Reward) { m_Reward = a_Reward; }  // tolua_export
 
@@ -39,4 +42,4 @@ protected:
 	
 	/** The number of ticks that the entity has existed / timer between collect and destroy; in msec */
 	float m_Timer;
-} ;
\ No newline at end of file
+} ;  // tolua_export
\ No newline at end of file
diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h
index c273567d1..74b917bce 100644
--- a/src/Entities/Pickup.h
+++ b/src/Entities/Pickup.h
@@ -26,31 +26,34 @@ public:
 	CLASS_PROTODEF(cPickup);
 
 	cPickup(double a_PosX, double a_PosY, double a_PosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f);
-	
+
 	cItem &       GetItem(void)       {return m_Item; } // tolua_export
 	const cItem & GetItem(void) const {return m_Item; }
 
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
-	
+
 	bool CollectedBy(cPlayer * a_Dest);					// tolua_export
 
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
-	
-	/// Returns the number of ticks that this entity has existed
-	int GetAge(void) const { return (int)(m_Timer / 50); }  // tolua_export
-	
-	/// Returns true if the pickup has already been collected
+
+	/** Returns the number of ticks that this entity has existed */
+	int GetAge(void) const { return (int)(m_Timer / 50); }     // tolua_export
+
+	/** Set the number of ticks that this entity has existed */
+	void SetAge(int a_Age) { m_Timer = (float)(a_Age * 50); }  // tolua_export
+
+	/** Returns true if the pickup has already been collected */
 	bool IsCollected(void) const { return m_bCollected; }  // tolua_export
 
-	/// Returns true if created by player (i.e. vomiting), used for determining picking-up delay time
+	/** Returns true if created by player (i.e. vomiting), used for determining picking-up delay time */
 	bool IsPlayerCreated(void) const { return m_bIsPlayerCreated; } // tolua_export
-	
+
 private:
 	Vector3d   m_ResultingSpeed;	 //Can be used to modify the resulting speed for the current tick ;)
 
 	Vector3d   m_WaterSpeed;
 
-	/// The number of ticks that the entity has existed / timer between collect and destroy; in msec
+	/** The number of ticks that the entity has existed / timer between collect and destroy; in msec */
 	float m_Timer;
 
 	cItem m_Item;
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index fa5547f46..37ebf0610 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -519,8 +519,8 @@ void cNBTChunkSerializer::AddPickupEntity(cPickup * a_Pickup)
 	m_Writer.BeginCompound("");
 		AddBasicEntity(a_Pickup, "Item");
 		AddItem(a_Pickup->GetItem(), -1, "Item");
-		m_Writer.AddShort("Health", a_Pickup->GetHealth());
-		m_Writer.AddShort("Age",    a_Pickup->GetAge());
+		m_Writer.AddShort("Health", (Int16)(unsigned char)a_Pickup->GetHealth());
+		m_Writer.AddShort("Age",    (Int16)a_Pickup->GetAge());
 	m_Writer.EndCompound();
 }
 
@@ -601,9 +601,9 @@ void cNBTChunkSerializer::AddExpOrbEntity(cExpOrb* a_ExpOrb)
 {
 	m_Writer.BeginCompound("");
 		AddBasicEntity(a_ExpOrb, "XPOrb");
-		m_Writer.AddShort("Health", (short)(unsigned char)a_ExpOrb->GetHealth());
-		m_Writer.AddShort("Age", (short)a_ExpOrb->GetAge());
-		m_Writer.AddShort("Value", (short)a_ExpOrb->GetReward());
+		m_Writer.AddShort("Health", (Int16)(unsigned char)a_ExpOrb->GetHealth());
+		m_Writer.AddShort("Age", (Int16)a_ExpOrb->GetAge());
+		m_Writer.AddShort("Value", (Int16)a_ExpOrb->GetReward());
 	m_Writer.EndCompound();
 }
 
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index c180f715f..bb0a831b3 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1383,6 +1383,7 @@ void cWSSAnvil::LoadMinecartHFromNBT(cEntityList & a_Entities, const cParsedNBT
 
 void cWSSAnvil::LoadPickupFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
 {
+	// Load item:
 	int ItemTag = a_NBT.FindChildByName(a_TagIdx, "Item");
 	if ((ItemTag < 0) || (a_NBT.GetType(ItemTag) != TAG_Compound))
 	{
@@ -1393,13 +1394,26 @@ void cWSSAnvil::LoadPickupFromNBT(cEntityList & a_Entities, const cParsedNBT & a
 	{
 		return;
 	}
+	
 	std::auto_ptr<cPickup> Pickup(new cPickup(0, 0, 0, Item, false)); // Pickup delay doesn't matter, just say false
 	if (!LoadEntityBaseFromNBT(*Pickup.get(), a_NBT, a_TagIdx))
 	{
 		return;
 	}
 
-	// TODO: Add health and age
+	// Load health:
+	int Health = a_NBT.FindChildByName(a_TagIdx, "Health");
+	if (Health > 0)
+	{
+		Pickup->SetHealth((int) (a_NBT.GetShort(Health) & 0xFF));
+	}
+	
+	// Load age:
+	int Age = a_NBT.FindChildByName(a_TagIdx, "Age");
+	if (Age > 0)
+	{
+		Pickup->SetAge(a_NBT.GetShort(Age));
+	}
 
 	a_Entities.push_back(Pickup.release());
 }