From 7915c4ca7cf4a7afaa86e62757d23364ead4c69e Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 2 Aug 2014 21:44:02 -0700
Subject: Entity.cpp: On portal check, use if-else for current dimension

If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
---
 src/Entities/Entity.cpp | 114 +++++++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 60 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index da578013d..c2727e6a1 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1068,42 +1068,38 @@ bool cEntity::DetectPortal()
 				}
 				m_PortalCooldownData.m_TicksDelayed = 0;
 
-				switch (GetWorld()->GetDimension())
+				if (GetWorld()->GetDimension() == dimNether)
 				{
-					case dimNether:
+					if (GetWorld()->GetLinkedOverworldName().empty())
 					{
-						if (GetWorld()->GetLinkedOverworldName().empty())
-						{
-							return false;
-						}
-
-						m_PortalCooldownData.m_ShouldPreventTeleportation = true;  // Stop portals from working on respawn
-
-						if (IsPlayer())
-						{
-							((cPlayer *)this)->GetClientHandle()->SendRespawn(dimOverworld);  // Send a respawn packet before world is loaded/generated so the client isn't left in limbo
-						}
-						
-						return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false);
+						return false;
 					}
-					case dimOverworld:
+
+					m_PortalCooldownData.m_ShouldPreventTeleportation = true;  // Stop portals from working on respawn
+
+					if (IsPlayer())
+					{
+						((cPlayer *)this)->GetClientHandle()->SendRespawn(dimOverworld);  // Send a respawn packet before world is loaded/generated so the client isn't left in limbo
+					}
+					
+					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false);
+				}
+				else
+				{
+					if (GetWorld()->GetNetherWorldName().empty())
+					{
+						return false;
+					}
+
+					m_PortalCooldownData.m_ShouldPreventTeleportation = true;
+
+					if (IsPlayer())
 					{
-						if (GetWorld()->GetNetherWorldName().empty())
-						{
-							return false;
-						}
-
-						m_PortalCooldownData.m_ShouldPreventTeleportation = true;
-
-						if (IsPlayer())
-						{
-							((cPlayer *)this)->AwardAchievement(achEnterPortal);
-							((cPlayer *)this)->GetClientHandle()->SendRespawn(dimNether);
-						}
-						
-						return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetNetherWorldName(), dimNether, GetWorld()->GetName()), false);
+						((cPlayer *)this)->AwardAchievement(achEnterPortal);
+						((cPlayer *)this)->GetClientHandle()->SendRespawn(dimNether);
 					}
-					default: return false;
+					
+					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetNetherWorldName(), dimNether, GetWorld()->GetName()), false);
 				}
 			}
 			case E_BLOCK_END_PORTAL:
@@ -1113,45 +1109,43 @@ bool cEntity::DetectPortal()
 					return false;
 				}
 
-				switch (GetWorld()->GetDimension())
+				if (GetWorld()->GetDimension() == dimEnd)
 				{
-					case dimEnd:
+					
+					if (GetWorld()->GetLinkedOverworldName().empty())
 					{
-						if (GetWorld()->GetLinkedOverworldName().empty())
-						{
-							return false;
-						}
-
-						m_PortalCooldownData.m_ShouldPreventTeleportation = true;
+						return false;
+					}
 
-						if (IsPlayer())
-						{
-							cPlayer * Player = (cPlayer *)this;
-							Player->TeleportToCoords(Player->GetLastBedPos().x, Player->GetLastBedPos().y, Player->GetLastBedPos().z);
-							Player->GetClientHandle()->SendRespawn(dimOverworld);
-						}
+					m_PortalCooldownData.m_ShouldPreventTeleportation = true;
 
-						return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false);
-					}
-					case dimOverworld:
+					if (IsPlayer())
 					{
-						if (GetWorld()->GetEndWorldName().empty())
-						{
-							return false;
-						}
+						cPlayer * Player = (cPlayer *)this;
+						Player->TeleportToCoords(Player->GetLastBedPos().x, Player->GetLastBedPos().y, Player->GetLastBedPos().z);
+						Player->GetClientHandle()->SendRespawn(dimOverworld);
+					}
 
-						m_PortalCooldownData.m_ShouldPreventTeleportation = true;
+					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false);
+				}
+				else
+				{
+					if (GetWorld()->GetEndWorldName().empty())
+					{
+						return false;
+					}
 
-						if (IsPlayer())
-						{
-							((cPlayer *)this)->AwardAchievement(achEnterTheEnd);
-							((cPlayer *)this)->GetClientHandle()->SendRespawn(dimEnd);
-						}
+					m_PortalCooldownData.m_ShouldPreventTeleportation = true;
 
-						return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetEndWorldName(), dimEnd, GetWorld()->GetName()), false);
+					if (IsPlayer())
+					{
+						((cPlayer *)this)->AwardAchievement(achEnterTheEnd);
+						((cPlayer *)this)->GetClientHandle()->SendRespawn(dimEnd);
 					}
-					default: return false;
+
+					return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetEndWorldName(), dimEnd, GetWorld()->GetName()), false);
 				}
+				
 			}
 			default: break;
 		}
-- 
cgit v1.2.3


From 9ecce2366e81ae66c77312220e378ff2f1b02a24 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 2 Aug 2014 22:35:29 -0700
Subject: Code reduction and clarity fixes

---
 src/Entities/Entity.cpp | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index c2727e6a1..042e3b868 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -543,10 +543,7 @@ void cEntity::KilledBy(TakeDamageInfo & a_TDI)
 void cEntity::Heal(int a_HitPoints)
 {
 	m_Health += a_HitPoints;
-	if (m_Health > m_MaxHealth)
-	{
-		m_Health = m_MaxHealth;
-	}
+	m_Health = std::min(m_Health, m_MaxHealth);
 }
 
 
@@ -555,7 +552,7 @@ void cEntity::Heal(int a_HitPoints)
 
 void cEntity::SetHealth(int a_Health)
 {
-	m_Health = std::max(0, std::min(m_MaxHealth, a_Health));
+	m_Health = Clamp(a_Health, 0, m_MaxHealth);
 }
 
 
@@ -1264,10 +1261,10 @@ void cEntity::HandleAir(void)
 			SetSpeedY(1);  // Float in the water
 		}
 
-		// Either reduce air level or damage player
-		if (m_AirLevel < 1)
+		if (m_AirLevel <= 0)
 		{
-			if (m_AirTickTimer < 1)
+			// Either reduce air level or damage player
+			if (m_AirTickTimer <= 0)
 			{
 				// Damage player
 				TakeDamage(dtDrowning, NULL, 1, 1, 0);
@@ -1552,17 +1549,10 @@ void cEntity::SetHeight(double a_Height)
 
 void cEntity::SetMass(double a_Mass)
 {
-	if (a_Mass > 0)
-	{
-		m_Mass = a_Mass;
-	}
-	else
-	{
-		// Make sure that mass is not zero. 1g is the default because we
-		// have to choose a number. It's perfectly legal to have a mass
-		// less than 1g as long as is NOT equal or less than zero.
-		m_Mass = 0.001;
-	}
+	// Make sure that mass is not zero. 1g is the default because we
+	// have to choose a number. It's perfectly legal to have a mass
+	// less than 1g as long as is NOT equal or less than zero.
+	m_Mass = std::max(a_Mass, 0.001);
 }
 
 
-- 
cgit v1.2.3


From e461df00302939cd767ae0c6a31ce22fc94e977c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sun, 3 Aug 2014 02:20:48 -0700
Subject: Entity.cpp: Air timer comment fix

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

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 042e3b868..a274e6780 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1263,7 +1263,7 @@ void cEntity::HandleAir(void)
 
 		if (m_AirLevel <= 0)
 		{
-			// Either reduce air level or damage player
+			// Runs the air tick timer to check whether the player should be damaged
 			if (m_AirTickTimer <= 0)
 			{
 				// Damage player
-- 
cgit v1.2.3


From 0911072d27820bd608bb908088419d3ec5151434 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Mon, 4 Aug 2014 01:34:12 +0200
Subject: Attempt to fix knockback and swimming.

---
 src/Entities/Entity.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a274e6780..32f220897 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -244,9 +244,9 @@ void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_R
 	Vector3d Heading(0, 0, 0);
 	if (a_Attacker != NULL)
 	{
-		Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 10 : 8);
+		Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 16 : 11);
+		Heading.y = 1.6;
 	}
-	Heading.y = 2;
 
 	TDI.Knockback = Heading * a_KnockbackAmount;
 	DoTakeDamage(TDI);
@@ -731,21 +731,19 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 		}
 		NextSpeed.y += fallspeed;
 	}
-	else
+
+	// Friction
+	if (NextSpeed.SqrLength() > 0.0004f)
 	{
-		// Friction
-		if (NextSpeed.SqrLength() > 0.0004f)
+		NextSpeed.x *= 0.7f / (1 + a_Dt);
+		if (fabs(NextSpeed.x) < 0.05)
 		{
-			NextSpeed.x *= 0.7f / (1 + a_Dt);
-			if (fabs(NextSpeed.x) < 0.05)
-			{
-				NextSpeed.x = 0;
-			}
-			NextSpeed.z *= 0.7f / (1 + a_Dt);
-			if (fabs(NextSpeed.z) < 0.05)
-			{
-				NextSpeed.z = 0;
-			}
+			NextSpeed.x = 0;
+		}
+		NextSpeed.z *= 0.7f / (1 + a_Dt);
+		if (fabs(NextSpeed.z) < 0.05)
+		{
+			NextSpeed.z = 0;
 		}
 	}
 
-- 
cgit v1.2.3


From d3fd63c9eb5f783da0186efcef81a5b0eb9338d6 Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Tue, 19 Aug 2014 12:38:15 +0200
Subject: Added some Enchantments

- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
---
 src/Entities/Entity.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 32f220897..398f7703b 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -316,8 +316,68 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		// IsOnGround() only is false if the player is moving downwards
 		// TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
-		if (!Player->IsOnGround())
+		
+		cEnchantments Enchantments = Player->GetEquippedItem().m_Enchantments;
+		
+		int SharpnessLevel = Enchantments.GetLevel(cEnchantments::enchSharpness);
+		int SmiteLevel = Enchantments.GetLevel(cEnchantments::enchSmite);
+		int BaneOfArthropodsLevel = Enchantments.GetLevel(cEnchantments::enchBaneOfArthropods);
+
+		if (SharpnessLevel > 0)
+		{
+			a_TDI.RawDamage += 1.25 * SharpnessLevel;
+		}
+		else if (SmiteLevel > 0)
+		{
+			if (IsMob())
+			{
+				cMonster * Monster = (cMonster *)this;
+				switch (Monster->GetMobType())
+				{
+					case cMonster::mtSkeleton:
+					case cMonster::mtZombie:
+					case cMonster::mtWither:
+					case cMonster::mtZombiePigman:
+					{
+						a_TDI.RawDamage += 2.5 * SmiteLevel;
+						break;
+					}
+				}
+			}
+		}
+		else if (BaneOfArthropodsLevel > 0)
+		{
+			if (IsMob())
+			{
+				cMonster * Monster = (cMonster *)this;
+				switch (Monster->GetMobType())
+				{
+					case cMonster::mtSpider:
+					case cMonster::mtCaveSpider:
+					case cMonster::mtSilverfish:
+					{
+						a_TDI.RawDamage += 2.5 * BaneOfArthropodsLevel;
+						break;
+					}
+				}
+			}
+		}
+
+		int FireAspectLevel = Enchantments.GetLevel(cEnchantments::enchFireAspect);
+		if (FireAspectLevel > 0)
 		{
+			int BurnTicks = 3;
+
+			if (FireAspectLevel > 1)
+			{
+				BurnTicks += 4 * (FireAspectLevel - 1);
+			}
+
+			StartBurning(BurnTicks * 20);
+		}
+	
+		if (!Player->IsOnGround())
+		{		
 			if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
 			{
 				a_TDI.FinalDamage += 2;
-- 
cgit v1.2.3


From 1897f678f93bb038fdc4caf1fb2995a28ef8f92e Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Tue, 19 Aug 2014 16:08:17 +0200
Subject: Added more enchantments and some fixes

- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
---
 src/Entities/Entity.cpp | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 398f7703b..05bad3a78 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -316,7 +316,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		// IsOnGround() only is false if the player is moving downwards
 		// TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
-		
+		// Thanks to daniel0916
 		cEnchantments Enchantments = Player->GetEquippedItem().m_Enchantments;
 		
 		int SharpnessLevel = Enchantments.GetLevel(cEnchantments::enchSharpness);
@@ -372,8 +372,27 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 			{
 				BurnTicks += 4 * (FireAspectLevel - 1);
 			}
+			if (!IsMob() && !IsSubmerged() && !IsSwimming())
+			{
+				StartBurning(BurnTicks * 20);
+			}
+			else if (IsMob() && !IsSubmerged() && !IsSwimming())
+			{
+				cMonster * Monster = (cMonster *)this;
+				switch (Monster->GetMobType())
+				{
+					case cMonster::mtGhast:
+					case cMonster::mtZombiePigman:
+					case cMonster::mtMagmaCube:
+					{
+						
+						break;
+					};
+					default:StartBurning(BurnTicks * 20);
+				}
+			}
 
-			StartBurning(BurnTicks * 20);
+			
 		}
 	
 		if (!Player->IsOnGround())
@@ -410,7 +429,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 			case 2: AdditionalSpeed.Set(8, 0.3, 8); break;
 			default: break;
 		}
-		AddSpeed(a_TDI.Knockback + AdditionalSpeed);
+		SetSpeed(a_TDI.Knockback + AdditionalSpeed);
 	}
 
 	m_World->BroadcastEntityStatus(*this, esGenericHurt);
-- 
cgit v1.2.3


From 07350de514cebd9009f5fbdb5774aa8f1266bdb3 Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Tue, 19 Aug 2014 16:47:33 +0200
Subject: Changed if for switch

---
 src/Entities/Entity.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 05bad3a78..4316b48e9 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -384,11 +384,10 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					case cMonster::mtGhast:
 					case cMonster::mtZombiePigman:
 					case cMonster::mtMagmaCube:
-					{
-						
+					{					
 						break;
 					};
-					default:StartBurning(BurnTicks * 20);
+					default: StartBurning(BurnTicks * 20);
 				}
 			}
 
-- 
cgit v1.2.3


From 5008eb8c8348ad2664158a8a815ef6851d874367 Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Tue, 19 Aug 2014 18:40:42 +0200
Subject: Changed if in BlockHandler

---
 src/Entities/Entity.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 4316b48e9..54e4cf4f5 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -316,7 +316,6 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		// IsOnGround() only is false if the player is moving downwards
 		// TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
-		// Thanks to daniel0916
 		cEnchantments Enchantments = Player->GetEquippedItem().m_Enchantments;
 		
 		int SharpnessLevel = Enchantments.GetLevel(cEnchantments::enchSharpness);
-- 
cgit v1.2.3


From 19d1c976e7cd7f6c8a4cb3540d5512a035a4162a Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Thu, 21 Aug 2014 12:08:38 +0200
Subject: Protection Enchantments, some fixes

- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
---
 src/Entities/Entity.cpp | 110 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 2 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 54e4cf4f5..a4c5c4b2a 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -13,6 +13,7 @@
 #include "../Tracer.h"
 #include "Player.h"
 #include "Items/ItemHandler.h"
+#include "../FastRandom.h"
 
 
 
@@ -324,7 +325,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		if (SharpnessLevel > 0)
 		{
-			a_TDI.RawDamage += 1.25 * SharpnessLevel;
+			a_TDI.FinalDamage += 1.25 * SharpnessLevel;
 		}
 		else if (SmiteLevel > 0)
 		{
@@ -338,7 +339,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					case cMonster::mtWither:
 					case cMonster::mtZombiePigman:
 					{
-						a_TDI.RawDamage += 2.5 * SmiteLevel;
+						a_TDI.FinalDamage += 2.5 * SmiteLevel;
 						break;
 					}
 				}
@@ -404,6 +405,110 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		Player->GetStatManager().AddValue(statDamageDealt, (StatValue)floor(a_TDI.FinalDamage * 10 + 0.5));
 	}
+	if (IsPlayer()){
+		double TotalEPF = 0.0;
+		double EPFProtection = 0.00;
+		double EPFFireProtection = 0.00;
+		double EPFBlastProtection = 0.00;
+		double EPFProjectileProtection = 0.00;
+		double EPFFeatherFalling = 0.00;
+
+		cEnchantments ChestplateEnchantments = GetEquippedChestplate().m_Enchantments;
+		cEnchantments LeggingsEnchantments = GetEquippedLeggings().m_Enchantments;
+		cEnchantments BootsEnchantments = GetEquippedBoots().m_Enchantments;
+		cEnchantments HelmetEnchantments = GetEquippedHelmet().m_Enchantments;
+
+		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchProtection) > 0)
+			|| (BootsEnchantments.GetLevel(cEnchantments::enchProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchProtection) > 0))
+		{
+			EPFProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
+			EPFProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
+			EPFProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
+			EPFProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
+
+			TotalEPF += EPFProtection;
+		}
+
+		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0)
+			|| (BootsEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0))
+		{
+			EPFFireProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
+			EPFFireProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
+			EPFFireProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
+			EPFFireProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
+			
+			TotalEPF += EPFFireProtection;
+		}
+
+		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0)
+			|| (BootsEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0))
+		{
+			EPFFeatherFalling += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+			EPFFeatherFalling += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+			EPFFeatherFalling += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+			EPFFeatherFalling += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+
+			TotalEPF += EPFFeatherFalling;
+		}
+
+		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0)
+			|| (BootsEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0))
+		{
+			EPFBlastProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+			EPFBlastProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+			EPFBlastProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+			EPFBlastProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+
+			TotalEPF += EPFBlastProtection;
+		}
+
+		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0)
+			|| (BootsEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0))
+		{
+			EPFProjectileProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
+			EPFProjectileProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
+			EPFProjectileProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
+			EPFProjectileProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
+
+			TotalEPF += EPFProjectileProtection;
+		}
+
+		EPFProtection = EPFProtection / TotalEPF;
+		EPFFireProtection = EPFFireProtection / TotalEPF;
+		EPFFeatherFalling = EPFFeatherFalling / TotalEPF;
+		EPFBlastProtection = EPFBlastProtection / TotalEPF;
+		EPFProjectileProtection = EPFProjectileProtection / TotalEPF;
+	
+		if (TotalEPF > 25) TotalEPF = 25;
+
+		cFastRandom Random;
+		float randomvalue;
+		randomvalue = Random.GenerateRandomInteger(50, 100) * 0.01;
+
+		TotalEPF = ceil(TotalEPF * randomvalue);
+
+		if (TotalEPF > 20) TotalEPF = 20;
+
+		EPFProtection = TotalEPF * EPFProtection;
+		EPFFireProtection = TotalEPF * EPFFireProtection;
+		EPFFeatherFalling = TotalEPF * EPFFeatherFalling;
+		EPFBlastProtection = TotalEPF * EPFBlastProtection;
+		EPFProjectileProtection = TotalEPF * EPFProjectileProtection;
+		
+		int RemovedDamage = 0;
+
+		if (a_TDI.DamageType != dtInVoid) RemovedDamage += ceil(EPFProtection * 0.04 * a_TDI.FinalDamage);
+
+		if ((a_TDI.DamageType == dtFalling) || (a_TDI.DamageType == dtFall) || (a_TDI.DamageType == dtEnderPearl)) RemovedDamage += ceil(EPFFeatherFalling * 0.04 * a_TDI.FinalDamage);
+		
+		if (a_TDI.DamageType == dtBurning) RemovedDamage += ceil(EPFFireProtection * 0.04 * a_TDI.FinalDamage);
+
+		if (a_TDI.DamageType == dtExplosion) RemovedDamage += ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
+
+		if (a_TDI.DamageType == dtProjectile) RemovedDamage += ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
+
+		a_TDI.FinalDamage -= RemovedDamage;
+	}
 
 	m_Health -= (short)a_TDI.FinalDamage;
 	
@@ -411,6 +516,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 	
 	m_Health = std::max(m_Health, 0);
 
+
 	if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL))  // Knockback for only players and mobs
 	{
 		int KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchKnockback);  // More common enchantment
-- 
cgit v1.2.3


From 7d771953c0e8275311ca13802e52ccf92a170644 Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Fri, 22 Aug 2014 11:49:49 +0200
Subject: More Enchantments

- Added Thorns and Respiration enchantments
---
 src/Entities/Entity.cpp | 127 ++++++++++++++++++++++++++----------------------
 1 file changed, 70 insertions(+), 57 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a4c5c4b2a..760401cc2 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -357,8 +357,11 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					case cMonster::mtSilverfish:
 					{
 						a_TDI.RawDamage += 2.5 * BaneOfArthropodsLevel;
+						// TODO: Add slowness effect
+						
 						break;
-					}
+					};
+					default: break;
 				}
 			}
 		}
@@ -390,8 +393,27 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					default: StartBurning(BurnTicks * 20);
 				}
 			}
+		}
 
-			
+		int ThornsLevel = 0;
+		cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
+		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
+		{
+			cItem Item = ArmorItems[i];
+			if (Item.m_Enchantments.GetLevel(cEnchantments::enchThorns) > ThornsLevel) ThornsLevel = Item.m_Enchantments.GetLevel(cEnchantments::enchThorns);
+		}
+
+		if (ThornsLevel > 0)
+		{
+			int Chance = ThornsLevel * 15;
+
+			cFastRandom Random;
+			int RandomValue = Random.GenerateRandomInteger(0, 100);
+
+			if (RandomValue <= Chance)
+			{
+				a_TDI.Attacker->TakeDamage(dtAttack, this, 0, Random.GenerateRandomInteger(1, 4), 0);
+			}
 		}
 	
 		if (!Player->IsOnGround())
@@ -405,6 +427,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		Player->GetStatManager().AddValue(statDamageDealt, (StatValue)floor(a_TDI.FinalDamage * 10 + 0.5));
 	}
+
 	if (IsPlayer()){
 		double TotalEPF = 0.0;
 		double EPFProtection = 0.00;
@@ -413,65 +436,39 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		double EPFProjectileProtection = 0.00;
 		double EPFFeatherFalling = 0.00;
 
-		cEnchantments ChestplateEnchantments = GetEquippedChestplate().m_Enchantments;
-		cEnchantments LeggingsEnchantments = GetEquippedLeggings().m_Enchantments;
-		cEnchantments BootsEnchantments = GetEquippedBoots().m_Enchantments;
-		cEnchantments HelmetEnchantments = GetEquippedHelmet().m_Enchantments;
-
-		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchProtection) > 0)
-			|| (BootsEnchantments.GetLevel(cEnchantments::enchProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchProtection) > 0))
+		cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
+		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
-			EPFProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
-			EPFProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
-			EPFProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
-			EPFProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
-
-			TotalEPF += EPFProtection;
-		}
+			cItem Item = ArmorItems[i];
+			if (Item.m_Enchantments.GetLevel(cEnchantments::enchProtection) > 0)
+			{
+				EPFProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
+			}
 
-		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0)
-			|| (BootsEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchFireProtection) > 0))
-		{
-			EPFFireProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
-			EPFFireProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
-			EPFFireProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
-			EPFFireProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
-			
-			TotalEPF += EPFFireProtection;
-		}
+			if (Item.m_Enchantments.GetLevel(cEnchantments::enchFireProtection) > 0)
+			{
+				EPFFireProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
+			}
 
-		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0)
-			|| (BootsEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0))
-		{
-			EPFFeatherFalling += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
-			EPFFeatherFalling += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
-			EPFFeatherFalling += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
-			EPFFeatherFalling += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+			if (Item.m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0)
+			{
+				EPFFeatherFalling += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+			}
 
-			TotalEPF += EPFFeatherFalling;
-		}
+			if (Item.m_Enchantments.GetLevel(cEnchantments::enchBlastProtection) > 0)
+			{
+				EPFBlastProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+			}
 
-		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0)
-			|| (BootsEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchBlastProtection) > 0))
-		{
-			EPFBlastProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
-			EPFBlastProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
-			EPFBlastProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
-			EPFBlastProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+			if (Item.m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0)
+			{
+				EPFProjectileProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
+			}
 
-			TotalEPF += EPFBlastProtection;
 		}
 
-		if ((ChestplateEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0) || (LeggingsEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0)
-			|| (BootsEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0) || (HelmetEnchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0))
-		{
-			EPFProjectileProtection += (6 + pow(ChestplateEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
-			EPFProjectileProtection += (6 + pow(LeggingsEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
-			EPFProjectileProtection += (6 + pow(BootsEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
-			EPFProjectileProtection += (6 + pow(HelmetEnchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
-
-			TotalEPF += EPFProjectileProtection;
-		}
+		TotalEPF = EPFProtection + EPFFireProtection + EPFFeatherFalling + EPFBlastProtection + EPFProjectileProtection;
+		
 
 		EPFProtection = EPFProtection / TotalEPF;
 		EPFFireProtection = EPFFireProtection / TotalEPF;
@@ -482,10 +479,9 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		if (TotalEPF > 25) TotalEPF = 25;
 
 		cFastRandom Random;
-		float randomvalue;
-		randomvalue = Random.GenerateRandomInteger(50, 100) * 0.01;
+		float RandomValue = Random.GenerateRandomInteger(50, 100) * 0.01;
 
-		TotalEPF = ceil(TotalEPF * randomvalue);
+		TotalEPF = ceil(TotalEPF * RandomValue);
 
 		if (TotalEPF > 20) TotalEPF = 20;
 
@@ -507,9 +503,13 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		if (a_TDI.DamageType == dtProjectile) RemovedDamage += ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
 
+		if (a_TDI.FinalDamage < RemovedDamage) RemovedDamage = 0;
+
 		a_TDI.FinalDamage -= RemovedDamage;
 	}
 
+
+
 	m_Health -= (short)a_TDI.FinalDamage;
 	
 	// TODO: Apply damage to armor
@@ -533,7 +533,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 			case 2: AdditionalSpeed.Set(8, 0.3, 8); break;
 			default: break;
 		}
-		SetSpeed(a_TDI.Knockback + AdditionalSpeed);
+		AddSpeed(a_TDI.Knockback + AdditionalSpeed);
 	}
 
 	m_World->BroadcastEntityStatus(*this, esGenericHurt);
@@ -1435,6 +1435,8 @@ void cEntity::HandleAir(void)
 	// See if the entity is /submerged/ water (block above is water)
 	// Get the type of block the entity is standing in:
 
+	int RespirationLevel = GetEquippedHelmet().m_Enchantments.GetLevel(cEnchantments::enchRespiration);
+
 	if (IsSubmerged())
 	{
 		if (!IsPlayer())  // Players control themselves
@@ -1442,6 +1444,11 @@ void cEntity::HandleAir(void)
 			SetSpeedY(1);  // Float in the water
 		}
 
+		if (RespirationLevel > 0)
+		{
+			((cPawn *)this)->AddEntityEffect(cEntityEffect::effNightVision, 200, 5, 0);
+		}
+
 		if (m_AirLevel <= 0)
 		{
 			// Runs the air tick timer to check whether the player should be damaged
@@ -1468,6 +1475,12 @@ void cEntity::HandleAir(void)
 		// Set the air back to maximum
 		m_AirLevel = MAX_AIR_LEVEL;
 		m_AirTickTimer = DROWNING_TICKS;
+
+		if (RespirationLevel > 0)
+		{
+			m_AirTickTimer = DROWNING_TICKS + (RespirationLevel * 15 * 20);
+		}
+
 	}
 }
 
-- 
cgit v1.2.3


From 4900645b2838b8a953fba298c5001b4e2d242931 Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Sat, 30 Aug 2014 00:27:33 +0200
Subject: Added  a_Digger check

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

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 760401cc2..10a0f8920 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -400,9 +400,9 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
 			cItem Item = ArmorItems[i];
-			if (Item.m_Enchantments.GetLevel(cEnchantments::enchThorns) > ThornsLevel) ThornsLevel = Item.m_Enchantments.GetLevel(cEnchantments::enchThorns);
+			ThornsLevel = std::max(ThornsLevel, Item.m_Enchantments.GetLevel(cEnchantments::enchThorns));
 		}
-
+		
 		if (ThornsLevel > 0)
 		{
 			int Chance = ThornsLevel * 15;
-- 
cgit v1.2.3


From 6180f7df095c228530e4c0d2bfaa90fed7b11f49 Mon Sep 17 00:00:00 2001
From: Jaume Aloy <hircine45@gmail.com>
Date: Sun, 31 Aug 2014 11:28:42 +0200
Subject: Fixed style

---
 src/Entities/Entity.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 10a0f8920..e36ed6c37 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -396,7 +396,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		}
 
 		int ThornsLevel = 0;
-		cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
+		const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
 			cItem Item = ArmorItems[i];
@@ -428,7 +428,8 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		Player->GetStatManager().AddValue(statDamageDealt, (StatValue)floor(a_TDI.FinalDamage * 10 + 0.5));
 	}
 
-	if (IsPlayer()){
+	if (IsPlayer())
+	{
 		double TotalEPF = 0.0;
 		double EPFProtection = 0.00;
 		double EPFFireProtection = 0.00;
@@ -436,7 +437,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		double EPFProjectileProtection = 0.00;
 		double EPFFeatherFalling = 0.00;
 
-		cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
+		const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
 			cItem Item = ArmorItems[i];
@@ -469,7 +470,6 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		TotalEPF = EPFProtection + EPFFireProtection + EPFFeatherFalling + EPFBlastProtection + EPFProjectileProtection;
 		
-
 		EPFProtection = EPFProtection / TotalEPF;
 		EPFFireProtection = EPFFireProtection / TotalEPF;
 		EPFFeatherFalling = EPFFeatherFalling / TotalEPF;
@@ -507,8 +507,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		a_TDI.FinalDamage -= RemovedDamage;
 	}
-
-
+	
 
 	m_Health -= (short)a_TDI.FinalDamage;
 	
@@ -516,7 +515,6 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 	
 	m_Health = std::max(m_Health, 0);
 
-
 	if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL))  // Knockback for only players and mobs
 	{
 		int KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchKnockback);  // More common enchantment
-- 
cgit v1.2.3


From 7d8a474f13c97186eb6d17b3dcf36dd225436fae Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 1 Sep 2014 14:31:05 +0200
Subject: Fixed MSVC compilation, improved performance.

We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
---
 src/Entities/Entity.cpp | 89 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 30 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index e36ed6c37..dde45c360 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -317,7 +317,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		// IsOnGround() only is false if the player is moving downwards
 		// TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
-		cEnchantments Enchantments = Player->GetEquippedItem().m_Enchantments;
+		const cEnchantments & Enchantments = Player->GetEquippedItem().m_Enchantments;
 		
 		int SharpnessLevel = Enchantments.GetLevel(cEnchantments::enchSharpness);
 		int SmiteLevel = Enchantments.GetLevel(cEnchantments::enchSmite);
@@ -325,7 +325,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 		if (SharpnessLevel > 0)
 		{
-			a_TDI.FinalDamage += 1.25 * SharpnessLevel;
+			a_TDI.FinalDamage += (int)ceil(1.25 * SharpnessLevel);
 		}
 		else if (SmiteLevel > 0)
 		{
@@ -339,7 +339,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					case cMonster::mtWither:
 					case cMonster::mtZombiePigman:
 					{
-						a_TDI.FinalDamage += 2.5 * SmiteLevel;
+						a_TDI.FinalDamage += (int)ceil(2.5 * SmiteLevel);
 						break;
 					}
 				}
@@ -356,7 +356,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					case cMonster::mtCaveSpider:
 					case cMonster::mtSilverfish:
 					{
-						a_TDI.RawDamage += 2.5 * BaneOfArthropodsLevel;
+						a_TDI.RawDamage += (int)ceil(2.5 * BaneOfArthropodsLevel);
 						// TODO: Add slowness effect
 						
 						break;
@@ -396,11 +396,11 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		}
 
 		int ThornsLevel = 0;
-		const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
+		const cItem * ArmorItems[] = { &GetEquippedHelmet(), &GetEquippedChestplate(), &GetEquippedLeggings(), &GetEquippedBoots() };
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
-			cItem Item = ArmorItems[i];
-			ThornsLevel = std::max(ThornsLevel, Item.m_Enchantments.GetLevel(cEnchantments::enchThorns));
+			const cItem * Item = ArmorItems[i];
+			ThornsLevel = std::max(ThornsLevel, Item->m_Enchantments.GetLevel(cEnchantments::enchThorns));
 		}
 		
 		if (ThornsLevel > 0)
@@ -437,33 +437,38 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		double EPFProjectileProtection = 0.00;
 		double EPFFeatherFalling = 0.00;
 
-		const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
+		const cItem * ArmorItems[] = { &GetEquippedHelmet(), &GetEquippedChestplate(), &GetEquippedLeggings(), &GetEquippedBoots() };
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
-			cItem Item = ArmorItems[i];
-			if (Item.m_Enchantments.GetLevel(cEnchantments::enchProtection) > 0)
+			const cItem * Item = ArmorItems[i];
+			int Level = Item->m_Enchantments.GetLevel(cEnchantments::enchProtection);
+			if (Level > 0)
 			{
-				EPFProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchProtection), 2)) * 0.75 / 3;
+				EPFProtection += (6 + Level * Level) * 0.75 / 3;
 			}
 
-			if (Item.m_Enchantments.GetLevel(cEnchantments::enchFireProtection) > 0)
+			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchFireProtection);
+			if (Level > 0)
 			{
-				EPFFireProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchFireProtection), 2)) * 1.25 / 3;
+				EPFFireProtection += (6 + Level * Level) * 1.25 / 3;
 			}
 
-			if (Item.m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling) > 0)
+			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling);
+			if (Level > 0)
 			{
-				EPFFeatherFalling += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling), 2)) * 2.5 / 3;
+				EPFFeatherFalling += (6 + Level * Level) * 2.5 / 3;
 			}
 
-			if (Item.m_Enchantments.GetLevel(cEnchantments::enchBlastProtection) > 0)
+			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchBlastProtection);
+			if (Level > 0)
 			{
-				EPFBlastProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchBlastProtection), 2)) * 1.5 / 3;
+				EPFBlastProtection += (6 + Level * Level) * 1.5 / 3;
 			}
 
-			if (Item.m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection) > 0)
+			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection);
+			if (Level > 0)
 			{
-				EPFProjectileProtection += (6 + pow(Item.m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection), 2)) * 1.5 / 3;
+				EPFProjectileProtection += (6 + Level * Level) * 1.5 / 3;
 			}
 
 		}
@@ -476,14 +481,20 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		EPFBlastProtection = EPFBlastProtection / TotalEPF;
 		EPFProjectileProtection = EPFProjectileProtection / TotalEPF;
 	
-		if (TotalEPF > 25) TotalEPF = 25;
+		if (TotalEPF > 25)
+		{
+			TotalEPF = 25;
+		}
 
 		cFastRandom Random;
-		float RandomValue = Random.GenerateRandomInteger(50, 100) * 0.01;
+		float RandomValue = Random.GenerateRandomInteger(50, 100) * 0.01f;
 
 		TotalEPF = ceil(TotalEPF * RandomValue);
 
-		if (TotalEPF > 20) TotalEPF = 20;
+		if (TotalEPF > 20)
+		{
+			TotalEPF = 20;
+		}
 
 		EPFProtection = TotalEPF * EPFProtection;
 		EPFFireProtection = TotalEPF * EPFFireProtection;
@@ -493,21 +504,38 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		
 		int RemovedDamage = 0;
 
-		if (a_TDI.DamageType != dtInVoid) RemovedDamage += ceil(EPFProtection * 0.04 * a_TDI.FinalDamage);
+		if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtAdmin))
+		{
+			RemovedDamage += (int)ceil(EPFProtection * 0.04 * a_TDI.FinalDamage);
+		}
 
-		if ((a_TDI.DamageType == dtFalling) || (a_TDI.DamageType == dtFall) || (a_TDI.DamageType == dtEnderPearl)) RemovedDamage += ceil(EPFFeatherFalling * 0.04 * a_TDI.FinalDamage);
+		if ((a_TDI.DamageType == dtFalling) || (a_TDI.DamageType == dtFall) || (a_TDI.DamageType == dtEnderPearl))
+		{
+			RemovedDamage += (int)ceil(EPFFeatherFalling * 0.04 * a_TDI.FinalDamage);
+		}
 		
-		if (a_TDI.DamageType == dtBurning) RemovedDamage += ceil(EPFFireProtection * 0.04 * a_TDI.FinalDamage);
+		if (a_TDI.DamageType == dtBurning)
+		{
+			RemovedDamage += (int)ceil(EPFFireProtection * 0.04 * a_TDI.FinalDamage);
+		}
 
-		if (a_TDI.DamageType == dtExplosion) RemovedDamage += ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
+		if (a_TDI.DamageType == dtExplosion)
+		{
+			RemovedDamage += (int)ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
+		}
 
-		if (a_TDI.DamageType == dtProjectile) RemovedDamage += ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
+		if (a_TDI.DamageType == dtProjectile)
+		{
+			RemovedDamage += (int)ceil(EPFBlastProtection * 0.04 * a_TDI.FinalDamage);
+		}
 
-		if (a_TDI.FinalDamage < RemovedDamage) RemovedDamage = 0;
+		if (a_TDI.FinalDamage < RemovedDamage)
+		{
+			RemovedDamage = 0;
+		}
 
 		a_TDI.FinalDamage -= RemovedDamage;
 	}
-	
 
 	m_Health -= (short)a_TDI.FinalDamage;
 	
@@ -515,7 +543,8 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 	
 	m_Health = std::max(m_Health, 0);
 
-	if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL))  // Knockback for only players and mobs
+	// Add knockback:
+	if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL))
 	{
 		int KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchKnockback);  // More common enchantment
 		if (KnockbackLevel < 1)
-- 
cgit v1.2.3


From 8821c476bb57a7fe4f45b0ff755394faa378fbef Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 1 Sep 2014 14:35:52 +0200
Subject: Fixed previous commit's wrong assumptions.

The equipment-getting functions return a copy already, so we can't take a pointer, really.
---
 src/Entities/Entity.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index dde45c360..89d1cffa1 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -396,11 +396,11 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		}
 
 		int ThornsLevel = 0;
-		const cItem * ArmorItems[] = { &GetEquippedHelmet(), &GetEquippedChestplate(), &GetEquippedLeggings(), &GetEquippedBoots() };
+		const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
-			const cItem * Item = ArmorItems[i];
-			ThornsLevel = std::max(ThornsLevel, Item->m_Enchantments.GetLevel(cEnchantments::enchThorns));
+			const cItem & Item = ArmorItems[i];
+			ThornsLevel = std::max(ThornsLevel, Item.m_Enchantments.GetLevel(cEnchantments::enchThorns));
 		}
 		
 		if (ThornsLevel > 0)
@@ -437,35 +437,35 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		double EPFProjectileProtection = 0.00;
 		double EPFFeatherFalling = 0.00;
 
-		const cItem * ArmorItems[] = { &GetEquippedHelmet(), &GetEquippedChestplate(), &GetEquippedLeggings(), &GetEquippedBoots() };
+		const cItem ArmorItems[] = { GetEquippedHelmet(), GetEquippedChestplate(), GetEquippedLeggings(), GetEquippedBoots() };
 		for (size_t i = 0; i < ARRAYCOUNT(ArmorItems); i++)
 		{
-			const cItem * Item = ArmorItems[i];
-			int Level = Item->m_Enchantments.GetLevel(cEnchantments::enchProtection);
+			const cItem & Item = ArmorItems[i];
+			int Level = Item.m_Enchantments.GetLevel(cEnchantments::enchProtection);
 			if (Level > 0)
 			{
 				EPFProtection += (6 + Level * Level) * 0.75 / 3;
 			}
 
-			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchFireProtection);
+			Level = Item.m_Enchantments.GetLevel(cEnchantments::enchFireProtection);
 			if (Level > 0)
 			{
 				EPFFireProtection += (6 + Level * Level) * 1.25 / 3;
 			}
 
-			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling);
+			Level = Item.m_Enchantments.GetLevel(cEnchantments::enchFeatherFalling);
 			if (Level > 0)
 			{
 				EPFFeatherFalling += (6 + Level * Level) * 2.5 / 3;
 			}
 
-			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchBlastProtection);
+			Level = Item.m_Enchantments.GetLevel(cEnchantments::enchBlastProtection);
 			if (Level > 0)
 			{
 				EPFBlastProtection += (6 + Level * Level) * 1.5 / 3;
 			}
 
-			Level = Item->m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection);
+			Level = Item.m_Enchantments.GetLevel(cEnchantments::enchProjectileProtection);
 			if (Level > 0)
 			{
 				EPFProjectileProtection += (6 + Level * Level) * 1.5 / 3;
-- 
cgit v1.2.3


From 1cc65b626462ca3e5aff1619e51450b5d33ff717 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 3 Sep 2014 10:29:10 +0200
Subject: Fixed style and alpha-sorting.

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

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 89d1cffa1..9bcdcffeb 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -387,7 +387,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 					case cMonster::mtGhast:
 					case cMonster::mtZombiePigman:
 					case cMonster::mtMagmaCube:
-					{					
+					{
 						break;
 					};
 					default: StartBurning(BurnTicks * 20);
@@ -417,7 +417,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 		}
 	
 		if (!Player->IsOnGround())
-		{		
+		{
 			if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
 			{
 				a_TDI.FinalDamage += 2;
-- 
cgit v1.2.3


From f94df06b6601f9dcecd383f5d093d225f41d1c65 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 9 Sep 2014 03:02:25 +0200
Subject: Added the player list to the 1.8 protocol.

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

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 9bcdcffeb..fba688847 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -135,7 +135,7 @@ const char * cEntity::GetParentClass(void) const
 
 bool cEntity::Initialize(cWorld & a_World)
 {
-	if (cPluginManager::Get()->CallHookSpawningEntity(a_World, *this))
+	if (cPluginManager::Get()->CallHookSpawningEntity(a_World, *this) && !IsPlayer())
 	{
 		return false;
 	}
-- 
cgit v1.2.3


From 4019847857b7737be949904c545d904a98096441 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri, 12 Sep 2014 20:50:24 +0100
Subject: Fixed friction being applied whilst airborne

Reported by tonibm9 in #1300.
---
 src/Entities/Entity.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 9bcdcffeb..6969501a3 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -941,19 +941,21 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 		}
 		NextSpeed.y += fallspeed;
 	}
-
-	// Friction
-	if (NextSpeed.SqrLength() > 0.0004f)
+	else
 	{
-		NextSpeed.x *= 0.7f / (1 + a_Dt);
-		if (fabs(NextSpeed.x) < 0.05)
-		{
-			NextSpeed.x = 0;
-		}
-		NextSpeed.z *= 0.7f / (1 + a_Dt);
-		if (fabs(NextSpeed.z) < 0.05)
+		// Friction on ground
+		if (NextSpeed.SqrLength() > 0.0004f)
 		{
-			NextSpeed.z = 0;
+			NextSpeed.x *= 0.7f / (1 + a_Dt);
+			if (fabs(NextSpeed.x) < 0.05)
+			{
+				NextSpeed.x = 0;
+			}
+			NextSpeed.z *= 0.7f / (1 + a_Dt);
+			if (fabs(NextSpeed.z) < 0.05)
+			{
+				NextSpeed.z = 0;
+			}
 		}
 	}
 
-- 
cgit v1.2.3


From 52d86728e69023f8d70c84f019335b713453aa2d Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 13 Sep 2014 22:49:05 +0100
Subject: Entities experience water resistance

---
 src/Entities/Entity.cpp | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 6969501a3..42b207c48 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -927,12 +927,13 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 		float fallspeed;
 		if (IsBlockWater(BlockIn))
 		{
-			fallspeed = m_Gravity * a_Dt / 3;  // Fall 3x slower in water.
+			fallspeed = m_Gravity * a_Dt / 3;  // Fall 3x slower in water
+			ApplyFriction(NextSpeed, 0.7, a_Dt);
 		}
 		else if (BlockIn == E_BLOCK_COBWEB)
 		{
 			NextSpeed.y *= 0.05;  // Reduce overall falling speed
-			fallspeed = 0;  // No falling.
+			fallspeed = 0;  // No falling
 		}
 		else
 		{
@@ -943,20 +944,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 	}
 	else
 	{
-		// Friction on ground
-		if (NextSpeed.SqrLength() > 0.0004f)
-		{
-			NextSpeed.x *= 0.7f / (1 + a_Dt);
-			if (fabs(NextSpeed.x) < 0.05)
-			{
-				NextSpeed.x = 0;
-			}
-			NextSpeed.z *= 0.7f / (1 + a_Dt);
-			if (fabs(NextSpeed.z) < 0.05)
-			{
-				NextSpeed.z = 0;
-			}
-		}
+		ApplyFriction(NextSpeed, 0.7, a_Dt);
 	}
 
 	// Adjust X and Z speed for COBWEB temporary. This speed modification should be handled inside block handlers since we
@@ -1062,6 +1050,27 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 
 
 
+void cEntity::ApplyFriction(Vector3d & a_Speed, double a_SlowdownMultiplier, float a_Dt)
+{
+	if (a_Speed.SqrLength() > 0.0004f)
+	{
+		a_Speed.x *= a_SlowdownMultiplier / (1 + a_Dt);
+		if (fabs(a_Speed.x) < 0.05)
+		{
+			a_Speed.x = 0;
+		}
+		a_Speed.z *= a_SlowdownMultiplier / (1 + a_Dt);
+		if (fabs(a_Speed.z) < 0.05)
+		{
+			a_Speed.z = 0;
+		}
+	}
+}
+
+
+
+
+
 void cEntity::TickBurning(cChunk & a_Chunk)
 {
 	// Remember the current burning state:
-- 
cgit v1.2.3


From 6e7c0e33b5dd6d86d66ac2eb1a07a33652a708fd Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 17 Sep 2014 18:40:10 +0100
Subject: Added first test to show the object can be created

---
 src/Entities/Entity.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 9bcdcffeb..4581eeda8 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -334,10 +334,10 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 				cMonster * Monster = (cMonster *)this;
 				switch (Monster->GetMobType())
 				{
-					case cMonster::mtSkeleton:
-					case cMonster::mtZombie:
-					case cMonster::mtWither:
-					case cMonster::mtZombiePigman:
+					case mtSkeleton:
+					case mtZombie:
+					case mtWither:
+					case mtZombiePigman:
 					{
 						a_TDI.FinalDamage += (int)ceil(2.5 * SmiteLevel);
 						break;
@@ -352,9 +352,9 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 				cMonster * Monster = (cMonster *)this;
 				switch (Monster->GetMobType())
 				{
-					case cMonster::mtSpider:
-					case cMonster::mtCaveSpider:
-					case cMonster::mtSilverfish:
+					case mtSpider:
+					case mtCaveSpider:
+					case mtSilverfish:
 					{
 						a_TDI.RawDamage += (int)ceil(2.5 * BaneOfArthropodsLevel);
 						// TODO: Add slowness effect
@@ -384,9 +384,9 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 				cMonster * Monster = (cMonster *)this;
 				switch (Monster->GetMobType())
 				{
-					case cMonster::mtGhast:
-					case cMonster::mtZombiePigman:
-					case cMonster::mtMagmaCube:
+					case mtGhast:
+					case mtZombiePigman:
+					case mtMagmaCube:
 					{
 						break;
 					};
-- 
cgit v1.2.3


From 195b646aa4189ec9858f4994754eadd2c05ef9df Mon Sep 17 00:00:00 2001
From: Chris Darnell <chris@cedeel.com>
Date: Mon, 22 Sep 2014 03:22:36 -0400
Subject: Made it compile with clang

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

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 42b207c48..996f2fff3 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -260,7 +260,7 @@ void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_R
 void cEntity::SetYawFromSpeed(void)
 {
 	const double EPS = 0.0000001;
-	if ((abs(m_Speed.x) < EPS) && (abs(m_Speed.z) < EPS))
+	if ((std::abs(m_Speed.x) < EPS) && (std::abs(m_Speed.z) < EPS))
 	{
 		// atan2() may overflow or is undefined, pick any number
 		SetYaw(0);
@@ -277,7 +277,7 @@ void cEntity::SetPitchFromSpeed(void)
 {
 	const double EPS = 0.0000001;
 	double xz = sqrt(m_Speed.x * m_Speed.x + m_Speed.z * m_Speed.z);  // Speed XZ-plane component
-	if ((abs(xz) < EPS) && (abs(m_Speed.y) < EPS))
+	if ((std::abs(xz) < EPS) && (std::abs(m_Speed.y) < EPS))
 	{
 		// atan2() may overflow or is undefined, pick any number
 		SetPitch(0);
-- 
cgit v1.2.3


From 806871b86f2f04545f20caa6a8c30db2ccb7bc12 Mon Sep 17 00:00:00 2001
From: Chris Darnell <chris@cedeel.com>
Date: Mon, 22 Sep 2014 18:23:56 -0400
Subject: A few compiler warning fixes

---
 src/Entities/Entity.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index c8ebc4314..8ef24828e 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -342,6 +342,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
 						a_TDI.FinalDamage += (int)ceil(2.5 * SmiteLevel);
 						break;
 					}
+					default: break;
 				}
 			}
 		}
@@ -1015,7 +1016,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
 				if (Tracer.HitNormal.y != 0.f) NextSpeed.y = 0.f;
 				if (Tracer.HitNormal.z != 0.f) NextSpeed.z = 0.f;
 
-				if (Tracer.HitNormal.y == 1)  // Hit BLOCK_FACE_YP, we are on the ground
+				if (Tracer.HitNormal.y == 1.f)  // Hit BLOCK_FACE_YP, we are on the ground
 				{
 					m_bOnGround = true;
 				}
@@ -1960,7 +1961,7 @@ void cEntity::SteerVehicle(float a_Forward, float a_Sideways)
 	{
 		return;
 	}
-	if ((a_Forward != 0) || (a_Sideways != 0))
+	if ((a_Forward != 0.f) || (a_Sideways != 0.f))
 	{
 		m_AttachedTo->HandleSpeedFromAttachee(a_Forward, a_Sideways);
 	}
-- 
cgit v1.2.3


From a3f940f47c8981146feed66225c1dd8066bac0e2 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Fri, 26 Sep 2014 18:13:19 +0100
Subject: Removed more unessicary includes

---
 src/Entities/Entity.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index c733d60ad..da85dec50 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -3,7 +3,6 @@
 
 #include "Entity.h"
 #include "../World.h"
-#include "../Server.h"
 #include "../Root.h"
 #include "../Matrix4.h"
 #include "../ClientHandle.h"
-- 
cgit v1.2.3