From 9e155c6add9a6108ee86d775910e9a396466ee7b Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sun, 20 Jul 2014 01:38:36 -0700
Subject: Added destroy-timer system to splash potion entities

---
 src/Entities/SplashPotionEntity.cpp |  7 ++++---
 src/Entities/SplashPotionEntity.h   | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index 13cbcb0fc..c1623845f 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -78,7 +78,8 @@ cSplashPotionEntity::cSplashPotionEntity(
 	super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
 	m_EntityEffectType(a_EntityEffectType),
 	m_EntityEffect(a_EntityEffect),
-	m_PotionColor(a_PotionColor)
+	m_PotionColor(a_PotionColor),
+	m_DestroyTimer(-1)
 {
 	SetSpeed(a_Speed);
 }
@@ -90,7 +91,7 @@ cSplashPotionEntity::cSplashPotionEntity(
 void cSplashPotionEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
 {
 	Splash(a_HitPos);
-	Destroy();
+	m_DestroyTimer = 2;
 }
 
 
@@ -101,7 +102,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;
 }
 
 
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h
index a33b06990..290dd81d4 100644
--- a/src/Entities/SplashPotionEntity.h
+++ b/src/Entities/SplashPotionEntity.h
@@ -52,10 +52,30 @@ protected:
 	// cProjectileEntity overrides:
 	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
 	virtual void OnHitEntity    (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	virtual void Tick           (float a_Dt, cChunk & a_Chunk) override
+	{
+		if (m_DestroyTimer > 0)
+		{
+			m_DestroyTimer--;
+			if (m_DestroyTimer == 0)
+			{
+				Destroy();
+				return;
+			}
+		}
+		else
+		{
+			super::Tick(a_Dt, a_Chunk);
+		}
+	}
 	
 	/** Splashes the potion, fires its particle effects and sounds
 	@param a_HitPos     The position where the potion will splash */
 	void Splash(const Vector3d & a_HitPos);
 	
 	virtual void SpawnOn(cClientHandle & a_Client) override;
+
+private:
+	/** Time in ticks to wait for the hit animation to begin before destroying */
+	int m_DestroyTimer;
 } ;  // tolua_export
-- 
cgit v1.2.3