diff options
| author | archshift <admin@archshift.com> | 2014-07-20 10:38:36 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-07-20 10:38:36 +0200 |
| commit | 9e155c6add9a6108ee86d775910e9a396466ee7b (patch) | |
| tree | 06dd1aab714ca878b327d00a588ac645076b8a6e /src/Entities/SplashPotionEntity.cpp | |
| parent | Merge pull request #1227 from mc-server/fixes (diff) | |
| download | cuberite-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 'src/Entities/SplashPotionEntity.cpp')
| -rw-r--r-- | src/Entities/SplashPotionEntity.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |