diff options
| author | Mattes D <github@xoft.cz> | 2014-10-21 21:25:52 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-21 21:25:52 +0200 |
| commit | 0c0c762412922b784aaf154b51a8d5d547d3f86f (patch) | |
| tree | 9e4b70bec26c126ff874e74bf1546df58e1513f1 /src/Entities/ThrownEnderPearlEntity.cpp | |
| parent | Merged branch 'master' of git://github.com/sriehl/MCServer (diff) | |
| download | cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.tar cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.tar.gz cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.tar.bz2 cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.tar.lz cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.tar.xz cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.tar.zst cuberite-0c0c762412922b784aaf154b51a8d5d547d3f86f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Entities/ThrownEnderPearlEntity.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/Entities/ThrownEnderPearlEntity.cpp b/src/Entities/ThrownEnderPearlEntity.cpp index c7407e6ae..8f1b62934 100644 --- a/src/Entities/ThrownEnderPearlEntity.cpp +++ b/src/Entities/ThrownEnderPearlEntity.cpp @@ -1,3 +1,4 @@ + #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "ThrownEnderPearlEntity.h" @@ -45,6 +46,27 @@ void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d +void cThrownEnderPearlEntity::Tick(float a_Dt, cChunk & a_Chunk) +{ + if (m_DestroyTimer > 0) + { + m_DestroyTimer--; + if (m_DestroyTimer == 0) + { + Destroy(); + return; + } + } + else + { + super::Tick(a_Dt, a_Chunk); + } +} + + + + + void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos) { if (m_CreatorData.m_Name.empty()) |