1 files changed, 27 insertions, 14 deletions

diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index 3efb1f25d..6d874e957 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -2,11 +2,15 @@
 
 #include "SplashPotionEntity.h"
 #include "Pawn.h"
+#include "../ClientHandle.h"
 
 
 
 
 
+/// Converts an angle in radians into a byte representation used by the network protocol
+#define ANGLE_TO_PROTO(X) (Byte)(X * 255 / 360)
+
 ////////////////////////////////////////////////////////////////////////////////
 // cSplashPotionEntityCallback:
 
@@ -29,25 +33,23 @@ public:
 	/** Called by cWorld::ForEachEntity(), adds the stored entity effect to the entity, if it is close enough. */
 	virtual bool Item(cEntity * a_Entity) override
 	{
-		double SplashDistance = (a_Entity->GetPosition() - m_HitPos).Length();
-		if (SplashDistance >= 20)
+		if (!a_Entity->IsPawn())
 		{
-			// Too far away
+			// Not an entity that can take effects
 			return false;
 		}
-		if (!a_Entity->IsPawn())
+
+		double SplashDistance = (a_Entity->GetPosition() - m_HitPos).Length();
+		if (SplashDistance >= 20)
 		{
-			// Not an entity that can take effects
+			// Too far away
 			return false;
 		}
 
 		// y = -0.25x + 1, where x is the distance from the player. Approximation for potion splash.
 		// TODO: better equation
 		double Reduction = -0.25 * SplashDistance + 1.0;
-		if (Reduction < 0)
-		{
-			Reduction = 0;
-		}
+		Reduction = std::max(Reduction, 0.0);
 		
 		((cPawn *) a_Entity)->AddEntityEffect(m_EntityEffectType, m_EntityEffect.GetDuration(), m_EntityEffect.GetIntensity(), Reduction);
 		return false;
@@ -72,12 +74,13 @@ cSplashPotionEntity::cSplashPotionEntity(
 	const Vector3d & a_Speed,
 	cEntityEffect::eType a_EntityEffectType,
 	cEntityEffect a_EntityEffect,
-	int a_PotionParticleType
+	int a_PotionColor
 ) :
 	super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
 	m_EntityEffectType(a_EntityEffectType),
 	m_EntityEffect(a_EntityEffect),
-	m_PotionParticleType(a_PotionParticleType)
+	m_PotionColor(a_PotionColor),
+	m_DestroyTimer(-1)
 {
 	SetSpeed(a_Speed);
 }
@@ -89,7 +92,7 @@ cSplashPotionEntity::cSplashPotionEntity(
 void cSplashPotionEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
 {
 	Splash(a_HitPos);
-	Destroy();
+	m_DestroyTimer = 2;
 }
 
 
@@ -100,7 +103,7 @@ void cSplashPotionEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_
 {
 	a_EntityHit.TakeDamage(dtRangedAttack, this, 0, 1);
 	Splash(a_HitPos);
-	Destroy(true);
+	m_DestroyTimer = 5;
 }
 
 
@@ -112,7 +115,17 @@ void cSplashPotionEntity::Splash(const Vector3d & a_HitPos)
 	cSplashPotionCallback Callback(a_HitPos, m_EntityEffectType, m_EntityEffect);
 	m_World->ForEachEntity(Callback);
 	
-	m_World->BroadcastSoundParticleEffect(2002, (int)a_HitPos.x, (int)a_HitPos.y, (int)a_HitPos.z, m_PotionParticleType);
+	m_World->BroadcastSoundParticleEffect(2002, (int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z), m_PotionColor);
+}
+
+
+
+
+
+void cSplashPotionEntity::SpawnOn(cClientHandle & a_Client)
+{
+	a_Client.SendSpawnObject(*this, 73, m_PotionColor, ANGLE_TO_PROTO(GetYaw()), ANGLE_TO_PROTO(GetPitch()));
+	a_Client.SendEntityMetadata(*this);
 }