flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1223 from mc-server/fixes

Browse Source 
Fixed small issues throughout the codebase
This commit is contained in:
Mattes D
2014-07-19 13:31:35 +02:00
parent e9a9bbf02e 11f8198a80
commit c2aa7d78bf
10 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Entities/SplashPotionEntity.cpp
View File

@@ -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;