summaryrefslogtreecommitdiffstats
path: root/src/Entities/Floater.cpp
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2013-12-20 18:34:08 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2013-12-20 18:34:08 +0100
commitaf98fc61703d719fe4dbff08a3d342c8053c3603 (patch)
treebafbc653102c81f003eb406f1cc1f7458dffb6e1 /src/Entities/Floater.cpp
parentMerge pull request #452 from mc-server/apidumpe (diff)
downloadcuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.tar
cuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.tar.gz
cuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.tar.bz2
cuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.tar.lz
cuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.tar.xz
cuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.tar.zst
cuberite-af98fc61703d719fe4dbff08a3d342c8053c3603.zip
Diffstat (limited to 'src/Entities/Floater.cpp')
-rw-r--r--src/Entities/Floater.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp
index bd7c952a8..0eefa9c54 100644
--- a/src/Entities/Floater.cpp
+++ b/src/Entities/Floater.cpp
@@ -36,7 +36,7 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
HandlePhysics(a_Dt, a_Chunk);
if (IsBlockWater(m_World->GetBlock((int) GetPosX(), (int) GetPosY(), (int) GetPosZ())))
{
- if (m_World->GetTickRandomNumber(100) == 0)
+ if ((!m_CanPickupItem) && (m_World->GetTickRandomNumber(100) == 0))
{
SetPosY(GetPosY() - 1);
m_CanPickupItem = true;
@@ -45,7 +45,7 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
}
else
{
- SetSpeedY(1);
+ SetSpeedY(0.7);
}
}
SetSpeedX(GetSpeedX() * 0.95);