summaryrefslogtreecommitdiffstats
path: root/src/Entities/SplashPotionEntity.h
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-20 10:38:36 +0200
committerarchshift <admin@archshift.com>2014-07-20 10:38:36 +0200
commit9e155c6add9a6108ee86d775910e9a396466ee7b (patch)
tree06dd1aab714ca878b327d00a588ac645076b8a6e /src/Entities/SplashPotionEntity.h
parentMerge pull request #1227 from mc-server/fixes (diff)
downloadcuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.tar
cuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.tar.gz
cuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.tar.bz2
cuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.tar.lz
cuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.tar.xz
cuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.tar.zst
cuberite-9e155c6add9a6108ee86d775910e9a396466ee7b.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/SplashPotionEntity.h20
1 files changed, 20 insertions, 0 deletions
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