diff options
| author | Mattes D <github@xoft.cz> | 2014-07-19 13:31:35 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-07-19 13:31:35 +0200 |
| commit | c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc (patch) | |
| tree | a8de103269fb7ef98a726e51bf8fcdfd17702ab9 /src/Entities/SplashPotionEntity.cpp | |
| parent | Merge pull request #1224 from mc-server/fixes-potions (diff) | |
| parent | World.cpp: fixed not all enum fields being used in m_Dimension switch (diff) | |
| download | cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.gz cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.bz2 cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.lz cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.xz cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.zst cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.zip | |
Diffstat (limited to 'src/Entities/SplashPotionEntity.cpp')
| -rw-r--r-- | src/Entities/SplashPotionEntity.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp index 056700629..13cbcb0fc 100644 --- a/src/Entities/SplashPotionEntity.cpp +++ b/src/Entities/SplashPotionEntity.cpp @@ -48,10 +48,7 @@ public: // y = -0.25x + 1, where x is the distance from the player. Approximation for potion splash. // TODO: better equation double Reduction = -0.25 * SplashDistance + 1.0; - if (Reduction < 0) - { - Reduction = 0; - } + Reduction = std::max(Reduction, 0.0); ((cPawn *) a_Entity)->AddEntityEffect(m_EntityEffectType, m_EntityEffect.GetDuration(), m_EntityEffect.GetIntensity(), Reduction); return false; |