diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2016-02-06 11:37:34 +0100 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2016-02-06 11:37:34 +0100 |
| commit | 6fdd7194c81be7234a126bdc3b48f0291fce3567 (patch) | |
| tree | 7d5ac74b7385ce4ebf77588d80549c884c2b993c /src/Entities/Floater.cpp | |
| parent | Merge pull request #2958 from LogicParrot/fence (diff) | |
| parent | Bulk clearing of whitespace (diff) | |
| download | cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.gz cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.bz2 cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.lz cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.xz cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.zst cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.zip | |
Diffstat (limited to 'src/Entities/Floater.cpp')
| -rw-r--r-- | src/Entities/Floater.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp index 0b96f12df..b405c5f65 100644 --- a/src/Entities/Floater.cpp +++ b/src/Entities/Floater.cpp @@ -49,7 +49,7 @@ public: m_MinCoeff = LineCoeff; m_HitEntity = a_Entity; } - + // Don't break the enumeration, we want all the entities return false; } @@ -91,7 +91,7 @@ public: m_EntityExists = true; return false; } - + bool DoesExist(void) const { return m_EntityExists; } protected: bool m_EntityExists; @@ -153,7 +153,7 @@ void cFloater::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) m_ParticlePos = (m_ParticlePos + (GetPosition() - m_ParticlePos) / 6); m_World->GetBroadcaster().BroadcastParticleEffect("splash", static_cast<Vector3f>(m_ParticlePos), Vector3f{}, 0, 15); } - + m_CountDownTime--; if (m_World->GetHeight(POSX_TOINT, POSZ_TOINT) == POSY_TOINT) { @@ -186,7 +186,7 @@ void cFloater::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) if ((GetSpeed().Length() > 4) && (m_AttachedMobID == cEntity::INVALID_ID)) { cFloaterEntityCollisionCallback Callback(this, GetPosition(), GetPosition() + GetSpeed() / 20); - + a_Chunk.ForEachEntity(Callback); if (Callback.HasHit()) { |