1 files changed, 89 insertions, 2 deletions

diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp
index 3e28392f4..98c5d23b4 100644
--- a/src/Entities/EntityEffect.cpp
+++ b/src/Entities/EntityEffect.cpp
@@ -34,14 +34,14 @@ cEntityEffect::eType cEntityEffect::GetPotionEffectType(short a_ItemDamage)
 		case 0x08: return cEntityEffect::effWeakness;
 		case 0x09: return cEntityEffect::effStrength;
 		case 0x0a: return cEntityEffect::effSlowness;
+		case 0x0b: return cEntityEffect::effJumpBoost;
 		case 0x0c: return cEntityEffect::effInstantDamage;
 		case 0x0d: return cEntityEffect::effWaterBreathing;
 		case 0x0e: return cEntityEffect::effInvisibility;
-			
+
 		// No effect potions
 		case 0x00:
 		case 0x07:
-		case 0x0b:  // Will be potion of leaping in 1.8
 		case 0x0f:
 		{
 			break;
@@ -96,6 +96,7 @@ int cEntityEffect::GetPotionEffectDuration(short a_ItemDamage)
 			base = 1800;
 			break;
 		}
+		default: break;
 	}
 	
 	// If potion is level II, half the duration. If not, stays the same
@@ -233,6 +234,92 @@ void cEntityEffect::OnTick(cPawn & a_Target)
 
 
 ////////////////////////////////////////////////////////////////////////////////
+// cEntityEffectSpeed:
+
+void cEntityEffectSpeed::OnActivate(cPawn & a_Target)
+{
+	if (a_Target.IsMob())
+	{
+		cMonster * Mob = (cMonster*) &a_Target;
+		Mob->SetRelativeWalkSpeed(Mob->GetRelativeWalkSpeed() + 0.2 * m_Intensity);
+	}
+	else if (a_Target.IsPlayer())
+	{
+		cPlayer * Player = (cPlayer*) &a_Target;
+		Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() + 0.2 * m_Intensity);
+		Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() + 0.26 * m_Intensity);
+		Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() + 0.2 * m_Intensity);
+	}
+}
+
+
+
+
+
+void cEntityEffectSpeed::OnDeactivate(cPawn & a_Target)
+{
+	if (a_Target.IsMob())
+	{
+		cMonster * Mob = (cMonster*) &a_Target;
+		Mob->SetRelativeWalkSpeed(Mob->GetRelativeWalkSpeed() - 0.2 * m_Intensity);
+	}
+	else if (a_Target.IsPlayer())
+	{
+		cPlayer * Player = (cPlayer*) &a_Target;
+		Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() - 0.2 * m_Intensity);
+		Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() - 0.26 * m_Intensity);
+		Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() - 0.2 * m_Intensity);
+	}
+}
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// cEntityEffectSlowness:
+
+void cEntityEffectSlowness::OnActivate(cPawn & a_Target)
+{
+	if (a_Target.IsMob())
+	{
+		cMonster * Mob = (cMonster*) &a_Target;
+		Mob->SetRelativeWalkSpeed(Mob->GetRelativeWalkSpeed() - 0.15 * m_Intensity);
+	}
+	else if (a_Target.IsPlayer())
+	{
+		cPlayer * Player = (cPlayer*) &a_Target;
+		Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() - 0.15 * m_Intensity);
+		Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() - 0.195 * m_Intensity);
+		Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() - 0.15 * m_Intensity);
+	}
+}
+
+
+
+
+
+void cEntityEffectSlowness::OnDeactivate(cPawn & a_Target)
+{
+	if (a_Target.IsMob())
+	{
+		cMonster * Mob = (cMonster*) &a_Target;
+		Mob->SetRelativeWalkSpeed(Mob->GetRelativeWalkSpeed() + 0.15 * m_Intensity);
+	}
+	else if (a_Target.IsPlayer())
+	{
+		cPlayer * Player = (cPlayer*) &a_Target;
+		Player->SetNormalMaxSpeed(Player->GetNormalMaxSpeed() + 0.15 * m_Intensity);
+		Player->SetSprintingMaxSpeed(Player->GetSprintingMaxSpeed() + 0.195 * m_Intensity);
+		Player->SetFlyingMaxSpeed(Player->GetFlyingMaxSpeed() + 0.15 * m_Intensity);
+	}
+}
+
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
 // cEntityEffectInstantHealth:
 
 void cEntityEffectInstantHealth::OnActivate(cPawn & a_Target)