diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:45:45 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:50:18 +0100 |
| commit | ca6ef58b1ee8521e4b940ee4883dee714960e413 (patch) | |
| tree | 8532add455224b07c07a759e3d906f50c0695888 /src/Entities/FireworkEntity.cpp | |
| parent | Merge pull request #2972 from marvinkopf/PlayerAutoComplete (diff) | |
| download | cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.gz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.bz2 cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.lz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.xz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.zst cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Entities/FireworkEntity.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/FireworkEntity.cpp b/src/Entities/FireworkEntity.cpp index 89f69f113..552549b7c 100644 --- a/src/Entities/FireworkEntity.cpp +++ b/src/Entities/FireworkEntity.cpp @@ -26,14 +26,14 @@ void cFireworkEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_C int RelX = POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width; int RelZ = POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width; int PosY = POSY_TOINT; - + if ((PosY < 0) || (PosY >= cChunkDef::Height)) { AddSpeedY(1); AddPosition(GetSpeed() * (static_cast<double>(a_Dt.count()) / 1000)); return; } - + if (m_IsInGround) { if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) == E_BLOCK_AIR) @@ -53,7 +53,7 @@ void cFireworkEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_C return; } } - + AddSpeedY(1); AddPosition(GetSpeed() * (static_cast<double>(a_Dt.count()) / 1000)); } @@ -65,7 +65,7 @@ void cFireworkEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_C void cFireworkEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) { super::Tick(a_Dt, a_Chunk); - + if (m_TicksToExplosion <= 0) { // TODO: Notify the plugins @@ -73,6 +73,6 @@ void cFireworkEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) Destroy(); return; } - + m_TicksToExplosion -= 1; } |