diff options
| author | Pokechu22 <Pokechu22@users.noreply.github.com> | 2016-05-14 21:12:42 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2016-05-14 21:12:42 +0200 |
| commit | a4f327118b06ced1cd4510b7d20d34da83aa78a3 (patch) | |
| tree | d6dbd41cfbec99f2598fb51907b86d9cbe0e8a05 /src/Entities/Pawn.cpp | |
| parent | Fixed death on teleportation or leaving Minecart (#3181) (diff) | |
| download | cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.tar cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.tar.gz cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.tar.bz2 cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.tar.lz cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.tar.xz cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.tar.zst cuberite-a4f327118b06ced1cd4510b7d20d34da83aa78a3.zip | |
Diffstat (limited to 'src/Entities/Pawn.cpp')
| -rw-r--r-- | src/Entities/Pawn.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index 69c2db5e7..462fa5057 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -418,8 +418,9 @@ void cPawn::HandleFalling(void) TakeDamage(dtFalling, nullptr, Damage, Damage, 0); // Fall particles - int ParticleSize = static_cast<int>((std::min(15, Damage) - 1.f) * ((50.f - 20.f) / (15.f - 1.f)) + 20.f); - GetWorld()->BroadcastSoundParticleEffect(EffectID::PARTICLE_FALL_PARTICLES, POSX_TOINT, POSY_TOINT - 1, POSZ_TOINT, ParticleSize); + // TODO: Re-enable this when effects in 1.9 aren't broken (right now this uses the wrong effect ID in 1.9 and the right one in 1.8 and 1.7) + // int ParticleSize = static_cast<int>((std::min(15, Damage) - 1.f) * ((50.f - 20.f) / (15.f - 1.f)) + 20.f); + // GetWorld()->BroadcastSoundParticleEffect(EffectID::PARTICLE_FALL_PARTICLES, POSX_TOINT, POSY_TOINT - 1, POSZ_TOINT, ParticleSize); } m_bTouchGround = true; |