From af98fc61703d719fe4dbff08a3d342c8053c3603 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Fri, 20 Dec 2013 18:34:08 +0100 Subject: [PATCH] Fixed bug where the floater could pop in the water while you could already get a fish. --- src/Entities/Floater.cpp | 4 ++-- 1 file 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);