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.cpp | |
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 'src/Entities/ThrownSnowballEntity.cpp')
-rw-r--r-- | src/Entities/ThrownSnowballEntity.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/ThrownSnowballEntity.cpp b/src/Entities/ThrownSnowballEntity.cpp index cefc3433c..b82cd56db 100644 --- a/src/Entities/ThrownSnowballEntity.cpp +++ b/src/Entities/ThrownSnowballEntity.cpp @@ -8,7 +8,8 @@ cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) : - super(pkSnowball, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25) + super(pkSnowball, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25), + m_DestroyTimer(-1) { SetSpeed(a_Speed); } @@ -19,7 +20,7 @@ cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, do void cThrownSnowballEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) { - Destroy(); + m_DestroyTimer = 5; } @@ -40,5 +41,5 @@ void cThrownSnowballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & // TODO: If entity is Ender Crystal, destroy it a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1); - Destroy(true); + m_DestroyTimer = 5; } |