7 files changed, 128 insertions, 15 deletions

diff --git a/src/Blocks/BlockMobHead.h b/src/Blocks/BlockMobHead.h
index acd1c88fb..552c0491c 100644
--- a/src/Blocks/BlockMobHead.h
+++ b/src/Blocks/BlockMobHead.h
@@ -46,8 +46,29 @@ public:
 			bool IsWither(void) const { return m_IsWither; }
 
 			void Reset(void) { m_IsWither = false; }
+
 		} CallbackA, CallbackB;
 
+		class cPlayerCallback : public cPlayerListCallback
+		{
+			Vector3f m_Pos;
+
+			virtual bool Item(cPlayer * a_Player)
+			{
+				double Dist = (a_Player->GetPosition() - m_Pos).Length();
+				if (Dist < 50.0)
+				{
+					// If player is close, award achievement
+					a_Player->AwardAchievement(achSpawnWither);
+				}
+				return false;
+			}
+
+		public:
+			cPlayerCallback(const Vector3f & a_Pos) : m_Pos(a_Pos) {}
+
+		} PlayerCallback(Vector3f(a_BlockX, a_BlockY, a_BlockZ));
+
 		a_World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ, CallbackA);
 
 		if (!CallbackA.IsWither())
@@ -86,6 +107,9 @@ public:
 			// Spawn the wither:
 			a_World->SpawnMob(a_BlockX + 0.5, a_BlockY - 2, a_BlockZ + 0.5, cMonster::mtWither);
 
+			// Award Achievement
+			a_World->ForEachPlayer(PlayerCallback);
+
 			return true;
 		}
 
@@ -113,6 +137,9 @@ public:
 			// Spawn the wither:
 			a_World->SpawnMob(a_BlockX + 0.5, a_BlockY - 2, a_BlockZ + 0.5, cMonster::mtWither);
 
+			// Award Achievement
+			a_World->ForEachPlayer(PlayerCallback);
+
 			return true;
 		}
 
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index c3b763278..0eacb67f9 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -456,8 +456,18 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
 	else
 	{
 		float Dist = (float)(m_LastGroundHeight - floor(GetPosY()));
+
+		if (Dist >= 2.0) // At least two blocks - TODO: Use m_LastJumpHeight instead of m_LastGroundHeight above
+		{
+			// Increment statistic
+			m_Stats.AddValue(statDistFallen, (StatValue)floor(Dist * 100 + 0.5));
+		}
+
 		int Damage = (int)(Dist - 3.f);
-		if (m_LastJumpHeight > m_LastGroundHeight) Damage++;
+		if (m_LastJumpHeight > m_LastGroundHeight)
+		{
+			Damage++;
+		}
 		m_LastJumpHeight = (float)GetPosY();
 
 		if (Damage > 0)
@@ -1951,32 +1961,65 @@ void cPlayer::HandleFloater()
 
 
 
+bool cPlayer::IsClimbing(void) const
+{
+	int PosX = POSX_TOINT;
+	int PosY = POSY_TOINT;
+	int PosZ = POSZ_TOINT;
+
+	if ((PosY < 0) || (PosY >= cChunkDef::Height))
+	{
+		return false;
+	}
+
+	BLOCKTYPE Block = m_World->GetBlock(PosX, PosY, PosZ);
+	switch (Block)
+	{
+		case E_BLOCK_LADDER:
+		case E_BLOCK_VINES:
+		{
+			return true;
+		}
+		default: return false;
+	}
+}
+
+
+
+
+
 void cPlayer::UpdateMovementStats(const Vector3d & a_DeltaPos)
 {
 	StatValue Value = (StatValue)floor(a_DeltaPos.Length() * 100 + 0.5);
 
 	if (m_AttachedTo == NULL)
 	{
-		int PosX = POSX_TOINT;
-		int PosY = POSY_TOINT;
-		int PosZ = POSZ_TOINT;
-
-		BLOCKTYPE Block;
-		NIBBLETYPE Meta;
-		if (!m_World->GetBlockTypeMeta(PosX, PosY, PosZ, Block, Meta))
+		if (IsClimbing())
 		{
-			return;
+			if (a_DeltaPos.y > 0.0) // Going up
+			{
+				m_Stats.AddValue(statDistClimbed, (StatValue)floor(a_DeltaPos.y * 100 + 0.5));
+			}
 		}
-
-		if ((Block == E_BLOCK_LADDER) && (a_DeltaPos.y > 0.0)) // Going up
+		else if (IsSubmerged())
 		{
-			m_Stats.AddValue(statDistClimbed, (StatValue)floor(a_DeltaPos.y * 100 + 0.5));
+			m_Stats.AddValue(statDistDove, Value);
 		}
-		else
+		else if (IsSwimming())
+		{
+			m_Stats.AddValue(statDistSwum, Value);
+		}
+		else if (IsOnGround())
 		{
-			// TODO 2014-05-12 xdot: Other types
 			m_Stats.AddValue(statDistWalked, Value);
 		}
+		else
+		{
+			if (Value >= 25) // Ignore small/slow movement
+			{
+				m_Stats.AddValue(statDistFlown, Value);
+			}
+		}
 	}
 	else
 	{
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 78b534d83..b7cb27d6c 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -127,6 +127,9 @@ public:
 	
 	inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); }  // tolua_export
 
+	/** Returns whether the player is climbing (ladders, vines e.t.c). */
+	bool IsClimbing(void) const;
+
 	virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override;
 
 	// tolua_begin
diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index 0431b88b7..32c151db5 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -142,6 +142,8 @@ public:
 							break;
 						}
 					}
+
+					a_Player->GetStatManager().AddValue(statTreasureFished, 1);
 				}
 				else if (ItemCategory <= 14)  // Junk 10%
 				{
@@ -190,6 +192,8 @@ public:
 					{
 						Drops.Add(cItem(E_BLOCK_TRIPWIRE_HOOK));
 					}
+
+					a_Player->GetStatManager().AddValue(statJunkFished, 1);
 				}
 				else  // Fish
 				{
@@ -210,6 +214,8 @@ public:
 					{
 						Drops.Add(cItem(E_ITEM_RAW_FISH, 1, E_META_RAW_FISH_FISH));
 					}
+
+					a_Player->GetStatManager().AddValue(statFishCaught, 1);
 				}
 
 				if (cRoot::Get()->GetPluginManager()->CallHookPlayerFishing(*a_Player, Drops))
diff --git a/src/Mobs/Wither.cpp b/src/Mobs/Wither.cpp
index 5b6e895e1..deb2cf34e 100644
--- a/src/Mobs/Wither.cpp
+++ b/src/Mobs/Wither.cpp
@@ -2,7 +2,9 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Wither.h"
+
 #include "../World.h"
+#include "../Entities/Player.h"
 
 
 
@@ -100,3 +102,34 @@ void cWither::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
+
+void cWither::KilledBy(cEntity * a_Killer)
+{
+	UNUSED(a_Killer);
+
+	class cPlayerCallback : public cPlayerListCallback
+	{
+		Vector3f m_Pos;
+
+		virtual bool Item(cPlayer * a_Player)
+		{
+			double Dist = (a_Player->GetPosition() - m_Pos).Length();
+			if (Dist < 50.0)
+			{
+				// If player is close, award achievement
+				a_Player->AwardAchievement(achKillWither);
+			}
+			return false;
+		}
+
+	public:
+		cPlayerCallback(const Vector3f & a_Pos) : m_Pos(a_Pos) {}
+
+	} PlayerCallback(GetPosition());
+
+	m_World->ForEachPlayer(PlayerCallback);
+}
+
+
+
+
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index 08b460009..93b4f8bfc 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -29,6 +29,7 @@ public:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void KilledBy(cEntity * a_Killer) override;
 
 private:
 
diff --git a/src/Statistics.cpp b/src/Statistics.cpp
index 5950eb96c..5c0524f9e 100644
--- a/src/Statistics.cpp
+++ b/src/Statistics.cpp
@@ -52,7 +52,7 @@ cStatInfo cStatInfo::ms_Info[statCount] = {
 	/*             Type         |     Name          */
 	cStatInfo(statGamesQuit,      "stat.leaveGame"),
 	cStatInfo(statMinutesPlayed,  "stat.playOneMinute"),
-	cStatInfo(statDistWalked,     "stat.walkOnCm"),
+	cStatInfo(statDistWalked,     "stat.walkOneCm"),
 	cStatInfo(statDistSwum,       "stat.swimOneCm"),
 	cStatInfo(statDistFallen,     "stat.fallOneCm"),
 	cStatInfo(statDistClimbed,    "stat.climbOneCm"),