From beab61bbfeca0280bce941c4175837109282c828 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Wed, 6 Aug 2014 14:16:36 -0700
Subject: On destroy ender crystal, create bedrock and fire

---
 src/Entities/EnderCrystal.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/EnderCrystal.cpp b/src/Entities/EnderCrystal.cpp
index bf86a6c42..c17bb608e 100644
--- a/src/Entities/EnderCrystal.cpp
+++ b/src/Entities/EnderCrystal.cpp
@@ -32,9 +32,6 @@ void cEnderCrystal::SpawnOn(cClientHandle & a_ClientHandle)
 void cEnderCrystal::Tick(float a_Dt, cChunk & a_Chunk)
 {
 	UNUSED(a_Dt);
-
-	a_Chunk.SetBlock(POSX_TOINT, POSY_TOINT, POSZ_TOINT, E_BLOCK_FIRE, 0);
-
 	// No further processing (physics e.t.c.) is needed
 }
 
@@ -49,6 +46,9 @@ void cEnderCrystal::KilledBy(TakeDamageInfo & a_TDI)
 	m_World->DoExplosionAt(6.0, GetPosX(), GetPosY(), GetPosZ(), true, esEnderCrystal, this);
 
 	Destroy();
+	
+	m_World->SetBlock(POSX_TOINT, POSY_TOINT,     POSZ_TOINT, E_BLOCK_BEDROCK, 0);
+	m_World->SetBlock(POSX_TOINT, POSY_TOINT + 1, POSZ_TOINT, E_BLOCK_FIRE,    0);
 }
 
 
-- 
cgit v1.2.3


From ae611563919d123a93d6aab0eaf20c7423acce23 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 10 Aug 2014 17:08:22 +0200
Subject: Fixed swing arm animation when you ate.

---
 src/Entities/Player.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index d1d7349a6..8fa060a5d 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -601,7 +601,6 @@ void cPlayer::FinishEating(void)
 	
 	// Send the packets:
 	m_ClientHandle->SendEntityStatus(*this, esPlayerEatingAccepted);
-	m_World->BroadcastEntityAnimation(*this, 0);
 	m_World->BroadcastEntityMetadata(*this);
 
 	// consume the item:
@@ -619,8 +618,8 @@ void cPlayer::FinishEating(void)
 	// if the food is mushroom soup, return a bowl to the inventory
 	if (Item.m_ItemType == E_ITEM_MUSHROOM_SOUP)
 	{
-		cItem emptyBowl(E_ITEM_BOWL, 1, 0, "");
-		GetInventory().AddItem(emptyBowl, true, true);
+		cItem EmptyBowl(E_ITEM_BOWL);
+		GetInventory().AddItem(EmptyBowl, true, true);
 	}
 }
 
@@ -631,7 +630,6 @@ void cPlayer::FinishEating(void)
 void cPlayer::AbortEating(void)
 {
 	m_EatingFinishTick = -1;
-	m_World->BroadcastEntityAnimation(*this, 0);
 	m_World->BroadcastEntityMetadata(*this);
 }
 
-- 
cgit v1.2.3


From 63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sun, 10 Aug 2014 20:47:16 +0100
Subject: Fixed potential crash in Player.cpp Fixes CID 71780 If
 ShouldBroadcastDeathMessages is false the pointer would fall through to a
 check agaist it being a player

---
 src/Entities/Player.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 8fa060a5d..8667344c7 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -906,6 +906,10 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
 		}
 		GetWorld()->BroadcastChatDeath(Printf("%s %s", GetName().c_str(), DamageText.c_str()));
 	}
+	else if (a_TDI.Attacker == NULL) // && !m_World->ShouldBroadcastDeathMessages() by fallthrough
+	{
+		// no-op
+	}
 	else if (a_TDI.Attacker->IsPlayer())
 	{
 		cPlayer * Killer = (cPlayer *)a_TDI.Attacker;
-- 
cgit v1.2.3


From 07103ed9d7af1c37623d6c8c96ec5084938c244b Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sun, 10 Aug 2014 21:26:28 +0100
Subject: Spaces

---
 src/Entities/Player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 8667344c7..608316e9a 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -906,7 +906,7 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
 		}
 		GetWorld()->BroadcastChatDeath(Printf("%s %s", GetName().c_str(), DamageText.c_str()));
 	}
-	else if (a_TDI.Attacker == NULL) // && !m_World->ShouldBroadcastDeathMessages() by fallthrough
+	else if (a_TDI.Attacker == NULL)  // && !m_World->ShouldBroadcastDeathMessages() by fallthrough
 	{
 		// no-op
 	}
-- 
cgit v1.2.3


From dba672361164dc5dc5f94d24bde3176c7de89d4c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 2 Aug 2014 22:42:53 -0700
Subject: Player.cpp: change unnamed enum to constant integers

---
 src/Entities/Player.cpp |  2 +-
 src/Entities/Player.h   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 608316e9a..91bcddca3 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -509,7 +509,7 @@ void cPlayer::Heal(int a_Health)
 
 void cPlayer::SetFoodLevel(int a_FoodLevel)
 {
-	int FoodLevel = std::max(0, std::min(a_FoodLevel, (int)MAX_FOOD_LEVEL));
+	int FoodLevel = Clamp(a_FoodLevel, 0, MAX_FOOD_LEVEL);
 
 	if (cRoot::Get()->GetPluginManager()->CallHookPlayerFoodLevelChange(*this, FoodLevel))
 	{
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index e26808bfc..f345a0207 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -29,12 +29,13 @@ class cPlayer :
 	typedef cPawn super;
 	
 public:
-	enum
-	{
-		MAX_HEALTH = 20,
-		MAX_FOOD_LEVEL = 20,
-		EATING_TICKS = 30,  ///< Number of ticks it takes to eat an item
-	} ;
+	static const int MAX_HEALTH = 20;
+	
+	static const int MAX_FOOD_LEVEL = 20;
+	
+	/** Number of ticks it takes to eat an item */
+	static const int EATING_TICKS = 30;
+	
 	// tolua_end
 	
 	CLASS_PROTODEF(cPlayer)
-- 
cgit v1.2.3


From a7eb4032ee32f8299857ccdfc4ad9f45227abb05 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sun, 10 Aug 2014 17:13:14 -0700
Subject: Fixed tolua error with static initialization

---
 src/Entities/Player.cpp | 9 +++++++++
 src/Entities/Player.h   | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 91bcddca3..4398a5bf3 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -33,6 +33,15 @@
 
 
 
+const int cPlayer::MAX_HEALTH = 20;
+
+const int cPlayer::MAX_FOOD_LEVEL = 20;
+
+/** Number of ticks it takes to eat an item */
+const int cPlayer::EATING_TICKS = 30;
+
+
+
 
 
 cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) :
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index f345a0207..d3ed1ef9d 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -29,12 +29,12 @@ class cPlayer :
 	typedef cPawn super;
 	
 public:
-	static const int MAX_HEALTH = 20;
+	static const int MAX_HEALTH;
 	
-	static const int MAX_FOOD_LEVEL = 20;
+	static const int MAX_FOOD_LEVEL;
 	
 	/** Number of ticks it takes to eat an item */
-	static const int EATING_TICKS = 30;
+	static const int EATING_TICKS;
 	
 	// tolua_end
 	
-- 
cgit v1.2.3


From a544c0238ba4c94d78692a7592107f8e510893ee Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 18:53:23 +0200
Subject: Implement ability to push minecarts on curved rails

---
 src/Entities/Minecart.cpp | 72 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index d4eadc5d5..19eaa207f 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -871,11 +871,79 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			return true;
 		}
 		case E_META_RAIL_CURVED_ZM_XM:
+		case E_META_RAIL_CURVED_ZP_XP:
+		{
+			Vector3d Distance(
+				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
+				0,
+				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
+			);
+
+			if ( Distance.z == 0. ) Distance.z = 0.0001;
+						if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
+			{
+				if ( (-GetSpeedX() * 0.4) < 0.01 )
+				{
+					AddSpeedX( -4/sqrt(2) );
+					AddSpeedZ( 4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( -GetSpeedX() * 0.4 );
+					SetSpeedZ( GetSpeedZ() * 0.4 );
+				}
+			}
+			else
+			{
+				if ((GetSpeedX() * 0.4) < 0.01)
+				{
+					AddSpeedX( 4/sqrt(2) );
+					AddSpeedZ( -4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( GetSpeedX() * 0.4 );
+					SetSpeedZ( -GetSpeedZ() * 0.4 );
+				}
+			}
+			break;
+		}
 		case E_META_RAIL_CURVED_ZM_XP:
 		case E_META_RAIL_CURVED_ZP_XM:
-		case E_META_RAIL_CURVED_ZP_XP:
 		{
-			// TODO - simply can't be bothered right now
+			Vector3d Distance(
+				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
+				0,
+				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
+			);
+
+			if ( Distance.z == 0. ) Distance.z = 0.0001;
+			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((Distance.z<0)&&((Distance.x/Distance.z)>=-1)) )
+			{
+				if ( (GetSpeedX() * 0.4) < 0.01 )
+				{
+					AddSpeedX( 4/sqrt(2) );
+					AddSpeedZ( 4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( GetSpeedX() * 0.4 );
+					SetSpeedZ( GetSpeedZ() * 0.4 );
+				}
+			}
+			else
+			{
+				if ((-GetSpeedX() * 0.4) < 0.01)
+				{
+					AddSpeedX( -4/sqrt(2) );
+					AddSpeedZ( -4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( -GetSpeedX() * 0.4 );
+					SetSpeedZ( -GetSpeedZ() * 0.4 );
+				}
+			}
 			break;
 		}
 		default: break;
-- 
cgit v1.2.3


From 3698c5c8295e6a6a0f37b17f3c04bb118cc58bf6 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 19:16:00 +0200
Subject: Fixed braces and intendation errors

---
 src/Entities/Minecart.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 19eaa207f..5cf56d3d2 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -879,8 +879,12 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. ) Distance.z = 0.0001;
-						if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
+			if ( Distance.z == 0. )
+			{
+			Distance.z = 0.0001;
+			}
+			
+			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
 			{
 				if ( (-GetSpeedX() * 0.4) < 0.01 )
 				{
@@ -917,7 +921,11 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. ) Distance.z = 0.0001;
+			if ( Distance.z == 0. )
+			{
+				Distance.z = 0.0001;
+			}
+
 			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((Distance.z<0)&&((Distance.x/Distance.z)>=-1)) )
 			{
 				if ( (GetSpeedX() * 0.4) < 0.01 )
-- 
cgit v1.2.3


From 3f117897fbda4eec95ad5cdd728f197840dd7224 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 19:18:11 +0200
Subject: Another intendation error

---
 src/Entities/Minecart.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 5cf56d3d2..cd5e2adaa 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -881,9 +881,9 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 
 			if ( Distance.z == 0. )
 			{
-			Distance.z = 0.0001;
+				Distance.z = 0.0001;
 			}
-			
+
 			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
 			{
 				if ( (-GetSpeedX() * 0.4) < 0.01 )
-- 
cgit v1.2.3


From 2d2d4ff33b74eefe053cce4d9a5daada65ed496b Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 19:47:43 +0200
Subject: Further fixing of coding style errors

---
 src/Entities/Minecart.cpp | 48 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index cd5e2adaa..45b9782f3 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -879,14 +879,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. )
+			if (Distance.z == 0.)
 			{
 				Distance.z = 0.0001;
 			}
 
-			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
+			if (((Distance.z >= 0) && ((Distance.x / Distance.z) >= 1)) ||
+				((Distance.z<0) && ((Distance.x / Distance.z) <= 1)))
 			{
-				if ( (-GetSpeedX() * 0.4) < 0.01 )
+				if ((-GetSpeedX() * 0.4) < 0.01)
 				{
 					AddSpeedX( -4/sqrt(2) );
 					AddSpeedZ( 4/sqrt(2) );
@@ -897,18 +898,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 					SetSpeedZ( GetSpeedZ() * 0.4 );
 				}
 			}
+			else if ((GetSpeedX() * 0.4) < 0.01)
+			{
+				AddSpeedX( 4/sqrt(2) );
+				AddSpeedZ( -4/sqrt(2) );
+			}
 			else
 			{
-				if ((GetSpeedX() * 0.4) < 0.01)
-				{
-					AddSpeedX( 4/sqrt(2) );
-					AddSpeedZ( -4/sqrt(2) );
-				}
-				else
-				{
-					SetSpeedX( GetSpeedX() * 0.4 );
-					SetSpeedZ( -GetSpeedZ() * 0.4 );
-				}
+				SetSpeedX( GetSpeedX() * 0.4 );
+				SetSpeedZ( -GetSpeedZ() * 0.4 );
 			}
 			break;
 		}
@@ -921,14 +919,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. )
+			if (Distance.z == 0.)
 			{
 				Distance.z = 0.0001;
 			}
 
-			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((Distance.z<0)&&((Distance.x/Distance.z)>=-1)) )
+			if (((Distance.z >= 0) && ((Distance.x / Distance.z) <= -1)) ||
+				((Distance.z<0) && ((Distance.x / Distance.z) >= -1)))
 			{
-				if ( (GetSpeedX() * 0.4) < 0.01 )
+				if ((GetSpeedX() * 0.4) < 0.01)
 				{
 					AddSpeedX( 4/sqrt(2) );
 					AddSpeedZ( 4/sqrt(2) );
@@ -939,18 +938,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 					SetSpeedZ( GetSpeedZ() * 0.4 );
 				}
 			}
+			else if ((-GetSpeedX() * 0.4) < 0.01)
+			{
+				AddSpeedX( -4/sqrt(2) );
+				AddSpeedZ( -4/sqrt(2) );
+			}
 			else
 			{
-				if ((-GetSpeedX() * 0.4) < 0.01)
-				{
-					AddSpeedX( -4/sqrt(2) );
-					AddSpeedZ( -4/sqrt(2) );
-				}
-				else
-				{
-					SetSpeedX( -GetSpeedX() * 0.4 );
-					SetSpeedZ( -GetSpeedZ() * 0.4 );
-				}
+				SetSpeedX( -GetSpeedX() * 0.4 );
+				SetSpeedZ( -GetSpeedZ() * 0.4 );
 			}
 			break;
 		}
-- 
cgit v1.2.3


From e3a74f379fc103f40e6bf85e626d7bac7db236af Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Thu, 14 Aug 2014 14:29:46 +0200
Subject: Further changes in coding style

---
 src/Entities/Minecart.cpp | 66 ++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 38 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 45b9782f3..8e11d8a07 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -873,80 +873,70 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 		case E_META_RAIL_CURVED_ZM_XM:
 		case E_META_RAIL_CURVED_ZP_XP:
 		{
-			Vector3d Distance(
-				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
-				0,
-				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
-			);
+			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
-			if (Distance.z == 0.)
-			{
-				Distance.z = 0.0001;
-			}
+			Distance.z = std::max(Distance.z, 0.001);
 
-			if (((Distance.z >= 0) && ((Distance.x / Distance.z) >= 1)) ||
-				((Distance.z<0) && ((Distance.x / Distance.z) <= 1)))
+			if (
+				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
+				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
+			)
 			{
 				if ((-GetSpeedX() * 0.4) < 0.01)
 				{
-					AddSpeedX( -4/sqrt(2) );
-					AddSpeedZ( 4/sqrt(2) );
+					AddSpeedX(-4/sqrt(2));
+					AddSpeedZ(4/sqrt(2));
 				}
 				else
 				{
-					SetSpeedX( -GetSpeedX() * 0.4 );
-					SetSpeedZ( GetSpeedZ() * 0.4 );
+					SetSpeedX(-GetSpeedX() * 0.4);
+					SetSpeedZ(GetSpeedZ() * 0.4);
 				}
 			}
 			else if ((GetSpeedX() * 0.4) < 0.01)
 			{
-				AddSpeedX( 4/sqrt(2) );
-				AddSpeedZ( -4/sqrt(2) );
+				AddSpeedX(4/sqrt(2));
+				AddSpeedZ(-4/sqrt(2));
 			}
 			else
 			{
-				SetSpeedX( GetSpeedX() * 0.4 );
-				SetSpeedZ( -GetSpeedZ() * 0.4 );
+				SetSpeedX(GetSpeedX() * 0.4);
+				SetSpeedZ(-GetSpeedZ() * 0.4);
 			}
 			break;
 		}
 		case E_META_RAIL_CURVED_ZM_XP:
 		case E_META_RAIL_CURVED_ZP_XM:
 		{
-			Vector3d Distance(
-				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
-				0,
-				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
-			);
+			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
-			if (Distance.z == 0.)
-			{
-				Distance.z = 0.0001;
-			}
+			Distance.z = std::max(Distance.z, 0.001);
 
-			if (((Distance.z >= 0) && ((Distance.x / Distance.z) <= -1)) ||
-				((Distance.z<0) && ((Distance.x / Distance.z) >= -1)))
+			if (
+				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
+				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
+			)
 			{
 				if ((GetSpeedX() * 0.4) < 0.01)
 				{
-					AddSpeedX( 4/sqrt(2) );
-					AddSpeedZ( 4/sqrt(2) );
+					AddSpeedX(4/sqrt(2));
+					AddSpeedZ(4/sqrt(2));
 				}
 				else
 				{
-					SetSpeedX( GetSpeedX() * 0.4 );
-					SetSpeedZ( GetSpeedZ() * 0.4 );
+					SetSpeedX(GetSpeedX() * 0.4);
+					SetSpeedZ(GetSpeedZ() * 0.4);
 				}
 			}
 			else if ((-GetSpeedX() * 0.4) < 0.01)
 			{
-				AddSpeedX( -4/sqrt(2) );
-				AddSpeedZ( -4/sqrt(2) );
+				AddSpeedX(-4/sqrt(2));
+				AddSpeedZ(-4/sqrt(2));
 			}
 			else
 			{
-				SetSpeedX( -GetSpeedX() * 0.4 );
-				SetSpeedZ( -GetSpeedZ() * 0.4 );
+				SetSpeedX(-GetSpeedX() * 0.4);
+				SetSpeedZ(-GetSpeedZ() * 0.4);
 			}
 			break;
 		}
-- 
cgit v1.2.3


From 0f631febfc3f670e8e9eb60ec4f89659ad7d0c71 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 13:40:56 +0200
Subject: Add some comments

---
 src/Entities/Minecart.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 8e11d8a07..0455c9ab3 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -875,17 +875,23 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 		{
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
+			// Prevent division by small numbers
 			Distance.z = std::max(Distance.z, 0.001);
 
+			/* Check to which side the minecart is to be pushed.
+			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
+			The minecart moves along the line z = -x, the perpendicular line to this is z = x.
+			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located.
+			*/
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
 			{
-				if ((-GetSpeedX() * 0.4) < 0.01)
+				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
 				{
-					AddSpeedX(-4/sqrt(2));
-					AddSpeedZ(4/sqrt(2));
+					AddSpeedX(-4 / sqrt(2));
+					AddSpeedZ(4 / sqrt(2));
 				}
 				else
 				{
@@ -893,10 +899,10 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 					SetSpeedZ(GetSpeedZ() * 0.4);
 				}
 			}
-			else if ((GetSpeedX() * 0.4) < 0.01)
+			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
 			{
-				AddSpeedX(4/sqrt(2));
-				AddSpeedZ(-4/sqrt(2));
+				AddSpeedX(4 / sqrt(2));
+				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
 			{
@@ -910,8 +916,13 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 		{
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
+			// Prevent division by small numbers
 			Distance.z = std::max(Distance.z, 0.001);
 
+			/* Check to which side the minecart is to be pushed.
+			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
+			The minecart moves along the line z = x, the perpendicular line to this is z = -x.
+			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
@@ -919,8 +930,8 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			{
 				if ((GetSpeedX() * 0.4) < 0.01)
 				{
-					AddSpeedX(4/sqrt(2));
-					AddSpeedZ(4/sqrt(2));
+					AddSpeedX(4 / sqrt(2));
+					AddSpeedZ(4 / sqrt(2));
 				}
 				else
 				{
@@ -930,8 +941,8 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			}
 			else if ((-GetSpeedX() * 0.4) < 0.01)
 			{
-				AddSpeedX(-4/sqrt(2));
-				AddSpeedZ(-4/sqrt(2));
+				AddSpeedX(-4 / sqrt(2));
+				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
 			{
-- 
cgit v1.2.3


From be03b84048a49e04db11aa6ce80b3d18fff313b1 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 13:43:45 +0200
Subject: End of comment moved away from new line

---
 src/Entities/Minecart.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 0455c9ab3..f190d972e 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -881,8 +881,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
 			The minecart moves along the line z = -x, the perpendicular line to this is z = x.
-			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located.
-			*/
+			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
-- 
cgit v1.2.3


From c473d8cfb82009411f5a3977b7041ee49ba08003 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 14:00:51 +0200
Subject: Clarify comment message

---
 src/Entities/Minecart.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index f190d972e..4753f720d 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -880,7 +880,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
-			The minecart moves along the line z = -x, the perpendicular line to this is z = x.
+			The minecart moves along the line x = -z, the perpendicular line to this is x = z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
@@ -920,7 +920,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
-			The minecart moves along the line z = x, the perpendicular line to this is z = -x.
+			The minecart moves along the line x = z, the perpendicular line to this is x = -z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
-- 
cgit v1.2.3


From 72c02ceb171949acd07338e77c8ee0d3439f8173 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 17:54:43 +0200
Subject: Added a lot of comments

---
 src/Entities/Minecart.cpp | 66 ++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 4753f720d..9420eca02 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -876,7 +876,10 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
 			// Prevent division by small numbers
-			Distance.z = std::max(Distance.z, 0.001);
+			if (abs(Distance.z) < 0.001)
+			{
+				Distance.z = 0.001;
+			}
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
@@ -886,27 +889,27 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
-			{
-				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-				{
+			{ // Moving -X + Z
+				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ speedX >= 0
+				{ // Immobile or not moving in the "right" direction. Give it a bump!
 					AddSpeedX(-4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else
-				{
-					SetSpeedX(-GetSpeedX() * 0.4);
-					SetSpeedZ(GetSpeedZ() * 0.4);
+				else // ~ SpeedX < 0
+				{ // Moving in the "right" direction. Only accelerate it a bit.
+					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			}
-			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-			{
+			} // Moving +X -Z
+			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ SpeedX <= 0
+			{ // Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else
-			{
-				SetSpeedX(GetSpeedX() * 0.4);
-				SetSpeedZ(-GetSpeedZ() * 0.4);
+			else // ~ SpeedX > 0
+			{ // Moving in the "right" direction
+				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
 			break;
 		}
@@ -916,37 +919,40 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
 			// Prevent division by small numbers
-			Distance.z = std::max(Distance.z, 0.001);
+			if (abs(Distance.z) < 0.001)
+			{
+				Distance.z = 0.001;
+			}
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
 			The minecart moves along the line x = z, the perpendicular line to this is x = -z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
-			if (
+			if ( // Moving +X +Z
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
 			)
 			{
-				if ((GetSpeedX() * 0.4) < 0.01)
-				{
+				if ((GetSpeedX() * 0.4) < 0.01) // ~ SpeedX <= 0
+				{ // Immobile or not moving in the "right" direction
 					AddSpeedX(4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else
-				{
-					SetSpeedX(GetSpeedX() * 0.4);
-					SetSpeedZ(GetSpeedZ() * 0.4);
+				else // SpeedX > 0
+				{ // Moving in the "right" direction
+					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			}
-			else if ((-GetSpeedX() * 0.4) < 0.01)
-			{
+			} // Moving -X -Z
+			else if ((-GetSpeedX() * 0.4) < 0.01) // ~ SpeedX >= 0
+			{ // Immobile or not moving in the "right" direction
 				AddSpeedX(-4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else
-			{
-				SetSpeedX(-GetSpeedX() * 0.4);
-				SetSpeedZ(-GetSpeedZ() * 0.4);
+			else // ~ SpeedX < 0
+			{ // Moving in the "right" direction
+				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
 			break;
 		}
-- 
cgit v1.2.3


From a68c70c900d0f3b3842d78af49423890f29af180 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 16 Aug 2014 18:44:14 +0200
Subject: Better OnPlayerMoving hook.

---
 src/Entities/Player.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 4398a5bf3..ab4ff3161 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -225,16 +225,24 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
 		SendExperience();
 	}
 
+	bool CanMove = true;
 	if (!GetPosition().EqualsEps(m_LastPos, 0.01))  // Non negligible change in position from last tick?
 	{
 		// Apply food exhaustion from movement:
 		ApplyFoodExhaustionFromMovement();
 		
-		cRoot::Get()->GetPluginManager()->CallHookPlayerMoving(*this);
+		if (cRoot::Get()->GetPluginManager()->CallHookPlayerMoving(*this, m_LastPos, GetPosition()))
+		{
+			CanMove = false;
+			TeleportToCoords(m_LastPos.x, m_LastPos.y, m_LastPos.z);
+		}
 		m_ClientHandle->StreamChunks();
 	}
 
-	BroadcastMovementUpdate(m_ClientHandle);
+	if (CanMove)
+	{
+		BroadcastMovementUpdate(m_ClientHandle);
+	}
 
 	if (m_Health > 0)  // make sure player is alive
 	{
-- 
cgit v1.2.3


From 80559406f99bd32de066c8a80b9f920b8b57b8f1 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 17 Aug 2014 22:47:00 +0200
Subject: Player saving creates the "players" folder, if needed.

Fixes #1268.
---
 src/Entities/Player.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index ab4ff3161..0b13e62a9 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1842,6 +1842,7 @@ bool cPlayer::LoadFromFile(const AString & a_FileName, cWorldPtr & a_World)
 
 bool cPlayer::SaveToDisk()
 {
+	cFile::CreateFolder(FILE_IO_PREFIX + AString("players/"));  // Create the "players" folder, if it doesn't exist yet (#1268)
 	cFile::CreateFolder(FILE_IO_PREFIX + AString("players/") + m_UUID.substr(0, 2));
 
 	// create the JSON data
-- 
cgit v1.2.3


From c70886a7124e5940b67cb4f1b4593f103f2707d8 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Mon, 18 Aug 2014 01:57:44 +0200
Subject: Adjust comment formatting

---
 src/Entities/Minecart.cpp | 60 +++++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 20 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 9420eca02..13469edb3 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -889,25 +889,35 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
-			{ // Moving -X + Z
-				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ speedX >= 0
-				{ // Immobile or not moving in the "right" direction. Give it a bump!
+			// Moving -X +Z
+			{
+				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
+				// ~ speedX >= 0
+				{
+					// Immobile or not moving in the "right" direction. Give it a bump!
 					AddSpeedX(-4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else // ~ SpeedX < 0
-				{ // Moving in the "right" direction. Only accelerate it a bit.
+				else
+				// ~ SpeedX < 0
+				{
+					// Moving in the "right" direction. Only accelerate it a bit.
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			} // Moving +X -Z
-			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ SpeedX <= 0
-			{ // Immobile or not moving in the "right" direction
+			}
+			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
+			// Moving +X -Z
+			// ~ SpeedX <= 0
+			{
+				// Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else // ~ SpeedX > 0
-			{ // Moving in the "right" direction
+			else
+			// ~ SpeedX > 0
+			{
+				// Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
@@ -928,29 +938,39 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
 			The minecart moves along the line x = z, the perpendicular line to this is x = -z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
-			if ( // Moving +X +Z
+			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
 			)
+			// Moving +X +Z
 			{
-				if ((GetSpeedX() * 0.4) < 0.01) // ~ SpeedX <= 0
-				{ // Immobile or not moving in the "right" direction
+				if ((GetSpeedX() * 0.4) < 0.01)
+				// ~ SpeedX <= 0
+				{
+					// Immobile or not moving in the "right" direction
 					AddSpeedX(4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else // SpeedX > 0
-				{ // Moving in the "right" direction
+				else
+				// SpeedX > 0
+				{
+					// Moving in the "right" direction
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			} // Moving -X -Z
-			else if ((-GetSpeedX() * 0.4) < 0.01) // ~ SpeedX >= 0
-			{ // Immobile or not moving in the "right" direction
+			}
+			else if ((-GetSpeedX() * 0.4) < 0.01)
+			// Moving -X -Z
+			// ~ SpeedX >= 0
+			{
+				// Immobile or not moving in the "right" direction
 				AddSpeedX(-4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else // ~ SpeedX < 0
-			{ // Moving in the "right" direction
+			else
+			// ~ SpeedX < 0
+			{
+				// Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
-- 
cgit v1.2.3


From e4fc05574bc4d888a8794d68c518e5242c494f69 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 18 Aug 2014 22:48:15 +0200
Subject: Player: Silenced a few type conversion warnings.

---
 src/Entities/Player.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 0b13e62a9..32290885d 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -892,7 +892,7 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI)
 		Pickups.Add(cItem(E_ITEM_RED_APPLE));
 	}
 
-	m_Stats.AddValue(statItemsDropped, Pickups.Size());
+	m_Stats.AddValue(statItemsDropped, (StatValue)Pickups.Size());
 
 	m_World->SpawnItemPickups(Pickups, GetPosX(), GetPosY(), GetPosZ(), 10);
 	SaveToDisk();  // Save it, yeah the world is a tough place !
@@ -1618,7 +1618,7 @@ void cPlayer::TossPickup(const cItem & a_Item)
 
 void cPlayer::TossItems(const cItems & a_Items)
 {
-	m_Stats.AddValue(statItemsDropped, a_Items.Size());
+	m_Stats.AddValue(statItemsDropped, (StatValue)a_Items.Size());
 
 	double vX = 0, vY = 0, vZ = 0;
 	EulerToVector(-GetYaw(), GetPitch(), vZ, vX, vY);
-- 
cgit v1.2.3


From 949aa2f3836cfa2b64ab5104b4b4103c4e2ad537 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 19 Aug 2014 17:34:11 +0200
Subject: cPlayer reads ranks from cRankManager.

---
 src/Entities/Player.cpp | 256 +++++++++++-------------------------------------
 src/Entities/Player.h   |  53 +++++-----
 2 files changed, 85 insertions(+), 224 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 4398a5bf3..423ca3317 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -59,7 +59,6 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) :
 	m_EnderChestContents(9, 3),
 	m_CurrentWindow(NULL),
 	m_InventoryWindow(NULL),
-	m_Color('-'),
 	m_GameMode(eGameMode_NotSet),
 	m_IP(""),
 	m_ClientHandle(a_Client),
@@ -1359,48 +1358,6 @@ void cPlayer::SetVisible(bool a_bVisible)
 
 
 
-void cPlayer::AddToGroup( const AString & a_GroupName)
-{
-	cGroup* Group = cRoot::Get()->GetGroupManager()->GetGroup( a_GroupName);
-	m_Groups.push_back( Group);
-	LOGD("Added %s to group %s", GetName().c_str(), a_GroupName.c_str());
-	ResolveGroups();
-	ResolvePermissions();
-}
-
-
-
-
-
-void cPlayer::RemoveFromGroup( const AString & a_GroupName)
-{
-	bool bRemoved = false;
-	for (GroupList::iterator itr = m_Groups.begin(); itr != m_Groups.end(); ++itr)
-	{
-		if ((*itr)->GetName().compare(a_GroupName) == 0)
-		{
-			m_Groups.erase( itr);
-			bRemoved = true;
-			break;
-		}
-	}
-
-	if (bRemoved)
-	{
-		LOGD("Removed %s from group %s", GetName().c_str(), a_GroupName.c_str());
-		ResolveGroups();
-		ResolvePermissions();
-	}
-	else
-	{
-		LOGWARN("Tried to remove %s from group %s but was not in that group", GetName().c_str(), a_GroupName.c_str());
-	}
-}
-
-
-
-
-
 bool cPlayer::HasPermission(const AString & a_Permission)
 {
 	if (a_Permission.empty())
@@ -1409,33 +1366,18 @@ bool cPlayer::HasPermission(const AString & a_Permission)
 		return true;
 	}
 	
-	AStringVector Split = StringSplit( a_Permission, ".");
-	PermissionMap Possibilities = m_ResolvedPermissions;
-	// Now search the namespaces
-	while (Possibilities.begin() != Possibilities.end())
+	AStringVector Split = StringSplit(a_Permission, ".");
+
+	// Iterate over all granted permissions; if any matches, then return success:
+	for (AStringVectorVector::const_iterator itr = m_SplitPermissions.begin(), end = m_SplitPermissions.end(); itr != end; ++itr)
 	{
-		PermissionMap::iterator itr = Possibilities.begin();
-		if (itr->second)
+		if (PermissionMatches(Split, *itr))
 		{
-			AStringVector OtherSplit = StringSplit( itr->first, ".");
-			if (OtherSplit.size() <= Split.size())
-			{
-				unsigned int i;
-				for (i = 0; i < OtherSplit.size(); ++i)
-				{
-					if (OtherSplit[i].compare( Split[i]) != 0)
-					{
-						if (OtherSplit[i].compare("*") == 0) return true;  // WildCard man!! WildCard!
-						break;
-					}
-				}
-				if (i == Split.size()) return true;
-			}
+			return true;
 		}
-		Possibilities.erase( itr);
-	}
+	}  // for itr - m_SplitPermissions[]
 
-	// Nothing that matched :(
+	// No granted permission matches
 	return false;
 }
 
@@ -1443,82 +1385,35 @@ bool cPlayer::HasPermission(const AString & a_Permission)
 
 
 
-bool cPlayer::IsInGroup( const AString & a_Group)
+bool cPlayer::PermissionMatches(const AStringVector & a_Permission, const AStringVector & a_Template)
 {
-	for (GroupList::iterator itr = m_ResolvedGroups.begin(); itr != m_ResolvedGroups.end(); ++itr)
+	// Check the sub-items if they are the same or there's a wildcard:
+	size_t lenP = a_Permission.size();
+	size_t lenT = a_Template.size();
+	size_t minLen = std::min(lenP, lenT);
+	for (size_t i = 0; i < minLen; i++)
 	{
-		if (a_Group.compare( (*itr)->GetName().c_str()) == 0)
+		if (a_Template[i] == "*")
+		{
+			// Has matched so far and now there's a wildcard in the template, so the permission matches:
 			return true;
-	}
-	return false;
-}
-
-
-
-
-
-void cPlayer::ResolvePermissions()
-{
-	m_ResolvedPermissions.clear();  // Start with an empty map
-
-	// Copy all player specific permissions into the resolved permissions map
-	for (PermissionMap::iterator itr = m_Permissions.begin(); itr != m_Permissions.end(); ++itr)
-	{
-		m_ResolvedPermissions[ itr->first ] = itr->second;
-	}
-
-	for (GroupList::iterator GroupItr = m_ResolvedGroups.begin(); GroupItr != m_ResolvedGroups.end(); ++GroupItr)
-	{
-		const cGroup::PermissionMap & Permissions = (*GroupItr)->GetPermissions();
-		for (cGroup::PermissionMap::const_iterator itr = Permissions.begin(); itr != Permissions.end(); ++itr)
+		}
+		if (a_Permission[i] != a_Template[i])
 		{
-			m_ResolvedPermissions[ itr->first ] = itr->second;
+			// Found a mismatch
+			return false;
 		}
 	}
-}
-
 
-
-
-
-void cPlayer::ResolveGroups()
-{
-	// Clear resolved groups first
-	m_ResolvedGroups.clear();
-
-	// Get a complete resolved list of all groups the player is in
-	std::map< cGroup*, bool > AllGroups;  // Use a map, because it's faster than iterating through a list to find duplicates
-	GroupList ToIterate;
-	for (GroupList::iterator GroupItr = m_Groups.begin(); GroupItr != m_Groups.end(); ++GroupItr)
-	{
-		ToIterate.push_back( *GroupItr);
-	}
-	while (ToIterate.begin() != ToIterate.end())
+	// So far all the sub-items have matched
+	// If the sub-item count is the same, then the permission matches:
+	if (lenP == lenT)
 	{
-		cGroup* CurrentGroup = *ToIterate.begin();
-		if (AllGroups.find( CurrentGroup) != AllGroups.end())
-		{
-			LOGWARNING("ERROR: Player \"%s\" is in the group multiple times (\"%s\"). Please fix your settings in users.ini!",
-				GetName().c_str(), CurrentGroup->GetName().c_str()
-			);
-		}
-		else
-		{
-			AllGroups[ CurrentGroup ] = true;
-			m_ResolvedGroups.push_back( CurrentGroup);  // Add group to resolved list
-			const cGroup::GroupList & Inherits = CurrentGroup->GetInherits();
-			for (cGroup::GroupList::const_iterator itr = Inherits.begin(); itr != Inherits.end(); ++itr)
-			{
-				if (AllGroups.find( *itr) != AllGroups.end())
-				{
-					LOGERROR("ERROR: Player %s is in the same group multiple times due to inheritance (%s). FIX IT!", GetName().c_str(), (*itr)->GetName().c_str());
-					continue;
-				}
-				ToIterate.push_back( *itr);
-			}
-		}
-		ToIterate.erase( ToIterate.begin());
+		return true;
 	}
+
+	// There are more sub-items in either the permission or the template, not a match:
+	return false;
 }
 
 
@@ -1527,17 +1422,14 @@ void cPlayer::ResolveGroups()
 
 AString cPlayer::GetColor(void) const
 {
-	if (m_Color != '-')
-	{
-		return cChatColor::Delimiter + m_Color;
-	}
-
-	if (m_Groups.size() < 1)
+	if (m_MsgNameColorCode.empty() || (m_MsgNameColorCode == "-"))
 	{
-		return cChatColor::White;
+		// Color has not been assigned, return an empty string:
+		return AString();
 	}
 
-	return (*m_Groups.begin())->GetColor();
+	// Return the color, including the delimiter:
+	return cChatColor::Delimiter + m_MsgNameColorCode;
 }
 
 
@@ -1653,48 +1545,9 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
 
 
 
-void cPlayer::LoadPermissionsFromDisk()
-{
-	m_Groups.clear();
-	m_Permissions.clear();
-
-	cIniFile IniFile;
-	if (IniFile.ReadFile("users.ini"))
-	{
-		AString Groups = IniFile.GetValueSet(GetName(), "Groups", "Default");
-		AStringVector Split = StringSplitAndTrim(Groups, ",");
-
-		for (AStringVector::const_iterator itr = Split.begin(), end = Split.end(); itr != end; ++itr)
-		{
-			if (!cRoot::Get()->GetGroupManager()->ExistsGroup(*itr))
-			{
-				LOGWARNING("The group %s for player %s was not found!", itr->c_str(), GetName().c_str());
-			}
-			AddToGroup(*itr);
-		}
-
-		AString Color = IniFile.GetValue(GetName(), "Color", "-");
-		if (!Color.empty())
-		{
-			m_Color = Color[0];
-		}
-	}
-	else
-	{
-		cGroupManager::GenerateDefaultUsersIni(IniFile);
-		IniFile.AddValue("Groups", GetName(), "Default");
-		AddToGroup("Default");
-	}
-	IniFile.WriteFile("users.ini");
-	ResolvePermissions();
-}
-
-
-
-
 bool cPlayer::LoadFromDisk(cWorldPtr & a_World)
 {
-	LoadPermissionsFromDisk();
+	LoadRank();
 
 	// Load from the UUID file:
 	if (LoadFromFile(GetUUIDFileName(m_UUID), a_World))
@@ -1928,26 +1781,6 @@ bool cPlayer::SaveToDisk()
 
 
 
-cPlayer::StringList cPlayer::GetResolvedPermissions()
-{
-	StringList Permissions;
-
-	const PermissionMap& ResolvedPermissions = m_ResolvedPermissions;
-	for (PermissionMap::const_iterator itr = ResolvedPermissions.begin(); itr != ResolvedPermissions.end(); ++itr)
-	{
-		if (itr->second)
-		{
-			Permissions.push_back( itr->first);
-		}
-	}
-
-	return Permissions;
-}
-
-
-
-
-
 void cPlayer::UseEquippedItem(int a_Amount)
 {
 	if (IsGameModeCreative())  // No damage in creative
@@ -2206,6 +2039,27 @@ void cPlayer::ApplyFoodExhaustionFromMovement()
 
 
 
+void cPlayer::LoadRank(void)
+{
+	// Load the values from cRankManager:
+	cRankManager & RankMgr = cRoot::Get()->GetRankManager();
+	m_Rank = RankMgr.GetPlayerRankName(m_UUID);
+	m_Permissions = RankMgr.GetPlayerPermissions(m_UUID);
+	RankMgr.GetPlayerMsgVisuals(m_UUID, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
+
+	// Break up the individual permissions on each dot, into m_SplitPermissions:
+	m_SplitPermissions.clear();
+	m_SplitPermissions.reserve(m_Permissions.size());
+	for (AStringVector::const_iterator itr = m_Permissions.begin(), end = m_Permissions.end(); itr != end; ++itr)
+	{
+		m_SplitPermissions.push_back(StringSplit(*itr, "."));
+	}  // for itr - m_Permissions[]
+}
+
+
+
+
+
 void cPlayer::Detach()
 {
 	super::Detach();
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index d3ed1ef9d..0ae014eeb 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -236,24 +236,20 @@ public:
 	
 	// tolua_end
 
-	typedef std::list< cGroup* > GroupList;
-	typedef std::list< std::string > StringList;
+	bool HasPermission(const AString & a_Permission);  // tolua_export
 
-	/** Adds a player to existing group or creates a new group when it doesn't exist */
-	void AddToGroup( const AString & a_GroupName);  // tolua_export
-	
-	/** Removes a player from the group, resolves permissions and group inheritance (case sensitive) */
-	void RemoveFromGroup( const AString & a_GroupName);  // tolua_export
-	
-	bool HasPermission( const AString & a_Permission);  // tolua_export
-	const GroupList & GetGroups() { return m_Groups; }  // >> EXPORTED IN MANUALBINDINGS <<
-	StringList GetResolvedPermissions();  // >> EXPORTED IN MANUALBINDINGS <<
-	bool IsInGroup( const AString & a_Group);  // tolua_export
+	/** Returns true iff a_Permission matches the a_Template.
+	A match is defined by either being exactly the same, or each sub-item matches until there's a wildcard in a_Template.
+	Ie. {"a", "b", "c"} matches {"a", "b", "*"} but doesn't match {"a", "b"} */
+	static bool PermissionMatches(const AStringVector & a_Permission, const AStringVector & a_Template);  // Exported in ManualBindings with AString params
+
+	/** Returns all the permissions that the player has assigned to them. */
+	const AStringVector & GetPermissions(void) { return m_Permissions; }  // Exported in ManualBindings.cpp
 
 	// tolua_begin
 	
-	/** Returns the full color code to use for this player, based on their primary group or set in m_Color.
-	The returned value includes the cChatColor::Delimiter. */
+	/** Returns the full color code to use for this player, based on their rank.
+	The returned value either is empty, or includes the cChatColor::Delimiter. */
 	AString GetColor(void) const;
 
 	/** tosses the item in the selected hotbar slot */
@@ -347,8 +343,6 @@ public:
 	*/
 	bool LoadFromFile(const AString & a_FileName, cWorldPtr & a_World);
 	
-	void LoadPermissionsFromDisk(void);  // tolua_export
-
 	const AString & GetLoadedWorldName() { return m_LoadedWorldName; }
 
 	void UseEquippedItem(int a_Amount = 1);
@@ -424,6 +418,11 @@ public:
 
 	// tolua_end
 
+	/** (Re)loads the rank and permissions from the cRankManager.
+	Expects the m_UUID member to be valid.
+	Loads the m_Rank, m_Permissions, m_MsgPrefix, m_MsgSuffix and m_MsgNameColorCode members. */
+	void LoadRank(void);
+
 	// cEntity overrides:
 	virtual bool IsCrouched (void) const { return m_IsCrouched; }
 	virtual bool IsSprinting(void) const { return m_IsSprinting; }
@@ -432,12 +431,22 @@ public:
 	virtual void Detach(void);
 	
 protected:
-	typedef std::map< std::string, bool > PermissionMap;
-	PermissionMap m_ResolvedPermissions;
-	PermissionMap m_Permissions;
 
-	GroupList m_ResolvedGroups;
-	GroupList m_Groups;
+	typedef std::vector<std::vector<AString> > AStringVectorVector;
+
+	/** The name of the rank assigned to this player. */
+	AString m_Rank;
+
+	/** All the permissions that this player has, based on their rank. */
+	AStringVector m_Permissions;
+
+	/** All the permissions that this player has, based on their rank, split into individual dot-delimited parts.
+	This is used mainly by the HasPermission() function to optimize the lookup. */
+	AStringVectorVector m_SplitPermissions;
+
+	// Message visuals:
+	AString m_MsgPrefix, m_MsgSuffix;
+	AString m_MsgNameColorCode;
 
 	AString m_PlayerName;
 	AString m_LoadedWorldName;
@@ -482,8 +491,6 @@ protected:
 	/** The player's last saved bed position */
 	Vector3i m_LastBedPos;
 
-	char m_Color;
-
 	eGameMode m_GameMode;
 	AString m_IP;
 	
-- 
cgit v1.2.3


From 1b97e4e6ff202f63f5e6ae8a6130536be17b754a Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 20 Aug 2014 20:37:51 +0200
Subject: cPlayer: Exported the LoadRank function to Lua API.

---
 src/Entities/Player.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 0ae014eeb..bfafcb7fb 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -416,13 +416,13 @@ public:
 	/** Returns the UUID (short format) that has been read from the client, or empty string if not available. */
 	const AString & GetUUID(void) const { return m_UUID; }
 
-	// tolua_end
-
 	/** (Re)loads the rank and permissions from the cRankManager.
 	Expects the m_UUID member to be valid.
 	Loads the m_Rank, m_Permissions, m_MsgPrefix, m_MsgSuffix and m_MsgNameColorCode members. */
 	void LoadRank(void);
 
+	// tolua_end
+
 	// cEntity overrides:
 	virtual bool IsCrouched (void) const { return m_IsCrouched; }
 	virtual bool IsSprinting(void) const { return m_IsSprinting; }
-- 
cgit v1.2.3


From 8acc8831879582e24c53c18d0442db0b1df6c6b6 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 21 Aug 2014 15:29:54 +0200
Subject: Removed cGroup and cGroupManager.

---
 src/Entities/Player.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 423ca3317..b6d6fc7b0 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -10,8 +10,6 @@
 #include "../Bindings/PluginManager.h"
 #include "../BlockEntities/BlockEntity.h"
 #include "../BlockEntities/EnderChestEntity.h"
-#include "../GroupManager.h"
-#include "../Group.h"
 #include "../Root.h"
 #include "../OSSupport/Timer.h"
 #include "../Chunk.h"
-- 
cgit v1.2.3


From 263ea5464b6761f7442d642006f9b9728b153ec1 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 21 Aug 2014 15:53:22 +0200
Subject: Removed last remnant of cGroup.

---
 src/Entities/Player.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index bfafcb7fb..9821cc6d9 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -13,7 +13,6 @@
 
 
 
-class cGroup;
 class cWindow;
 class cClientHandle;
 class cTeam;
-- 
cgit v1.2.3


From a56634799e1fb7eef3d2817bd7d9c1b42969e934 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Sun, 24 Aug 2014 15:03:02 +0200
Subject: Change comment formatting

---
 src/Entities/Minecart.cpp | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 13469edb3..f43c4d163 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -889,35 +889,31 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
-			// Moving -X +Z
 			{
+				// Moving -X +Z
 				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-				// ~ speedX >= 0
 				{
-					// Immobile or not moving in the "right" direction. Give it a bump!
+					// ~ SpeedX >= 0 Immobile or not moving in the "right" direction. Give it a bump!
 					AddSpeedX(-4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
 				else
-				// ~ SpeedX < 0
 				{
-					// Moving in the "right" direction. Only accelerate it a bit.
+					// ~ SpeedX < 0 Moving in the "right" direction. Only accelerate it a bit.
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
 			}
 			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-			// Moving +X -Z
-			// ~ SpeedX <= 0
 			{
-				// Immobile or not moving in the "right" direction
+				// Moving +X -T
+				// ~ SpeedX <= 0 Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
-			// ~ SpeedX > 0
 			{
-				// Moving in the "right" direction
+				// ~ SpeedX > 0 Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
@@ -942,35 +938,31 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
 			)
-			// Moving +X +Z
 			{
+				// Moving +X +Z
 				if ((GetSpeedX() * 0.4) < 0.01)
-				// ~ SpeedX <= 0
 				{
-					// Immobile or not moving in the "right" direction
+					// ~ SpeedX <= 0 Immobile or not moving in the "right" direction
 					AddSpeedX(4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
 				else
-				// SpeedX > 0
 				{
-					// Moving in the "right" direction
+					// ~ SpeedX > 0 Moving in the "right" direction
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
 			}
 			else if ((-GetSpeedX() * 0.4) < 0.01)
-			// Moving -X -Z
-			// ~ SpeedX >= 0
 			{
-				// Immobile or not moving in the "right" direction
+				// Moving -X -Z
+				// ~ SpeedX >= 0 Immobile or not moving in the "right" direction
 				AddSpeedX(-4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
-			// ~ SpeedX < 0
 			{
-				// Moving in the "right" direction
+				// ~ SpeedX < 0 Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
-- 
cgit v1.2.3


From 8630b20c523033b359e4f9d7513cb6e4aafec1cb Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 24 Aug 2014 20:00:45 +0200
Subject: RankMgr: Default rank is applied to players without any rank.

---
 src/Entities/Player.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 7992204da..b0dd40615 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -2051,8 +2051,12 @@ void cPlayer::LoadRank(void)
 	// Load the values from cRankManager:
 	cRankManager & RankMgr = cRoot::Get()->GetRankManager();
 	m_Rank = RankMgr.GetPlayerRankName(m_UUID);
+	if (m_Rank.empty())
+	{
+		m_Rank = RankMgr.GetDefaultRank();
+	}
 	m_Permissions = RankMgr.GetPlayerPermissions(m_UUID);
-	RankMgr.GetPlayerMsgVisuals(m_UUID, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
+	RankMgr.GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
 
 	// Break up the individual permissions on each dot, into m_SplitPermissions:
 	m_SplitPermissions.clear();
-- 
cgit v1.2.3


From 1c136a60478811dabfb54e89a27fb1229d0d1b49 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 28 Aug 2014 17:04:26 +0300
Subject: Fixed a typo.

---
 src/Entities/Minecart.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Entities')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index f43c4d163..21c58fdba 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -906,7 +906,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			}
 			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
 			{
-				// Moving +X -T
+				// Moving +X -Z
 				// ~ SpeedX <= 0 Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
-- 
cgit v1.2.3