diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-22 21:44:01 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-22 21:44:01 +0200 |
commit | 33cc1f2a50d870b7d264ee5479068f8eee3aa458 (patch) | |
tree | 1f2d80ea19911c620b5ce17efe502fcb3bc81da0 /src/Entities/ThrownSnowballEntity.h | |
parent | Merge branch 'master' of https://github.com/mc-server/MCServer (diff) | |
download | cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.tar cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.tar.gz cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.tar.bz2 cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.tar.lz cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.tar.xz cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.tar.zst cuberite-33cc1f2a50d870b7d264ee5479068f8eee3aa458.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/ThrownSnowballEntity.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/Entities/ThrownSnowballEntity.h b/src/Entities/ThrownSnowballEntity.h index a09512e37..e30971f0a 100644 --- a/src/Entities/ThrownSnowballEntity.h +++ b/src/Entities/ThrownSnowballEntity.h @@ -30,5 +30,23 @@ 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); } + } + +private: + + /** Time in ticks to wait for the hit animation to begin before destroying */ + int m_DestroyTimer; } ; // tolua_export |