summaryrefslogtreecommitdiffstats
path: root/source/Pickup.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-13 11:53:28 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-13 11:53:28 +0200
commitf7da7c2536b438db92bc28b88c4139d9af15e44f (patch)
tree4710e9e41ebcf2317ebacade2801732ba9184b41 /source/Pickup.cpp
parentProtoProxy: Fixed parsing of the PACKET_PLAYER_ABILITIES packet. (diff)
downloadcuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.tar
cuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.tar.gz
cuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.tar.bz2
cuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.tar.lz
cuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.tar.xz
cuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.tar.zst
cuberite-f7da7c2536b438db92bc28b88c4139d9af15e44f.zip
Diffstat (limited to 'source/Pickup.cpp')
-rw-r--r--source/Pickup.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/Pickup.cpp b/source/Pickup.cpp
index 8a32a328b..ea1f603a4 100644
--- a/source/Pickup.cpp
+++ b/source/Pickup.cpp
@@ -9,7 +9,7 @@
#include "ClientHandle.h"
#include "Inventory.h"
#include "World.h"
-#include "WaterSimulator.h"
+#include "Simulator/FluidSimulator.h"
#include "Server.h"
#include "Player.h"
#include "PluginManager.h"
@@ -157,11 +157,9 @@ void cPickup::HandlePhysics(float a_Dt)
if( fabs(m_Speed.z) < 0.05 ) m_Speed.z = 0;
}
-
- //get flowing direction
+ // get flowing direction
Direction WaterDir = World->GetWaterSimulator()->GetFlowingDirection((int) m_Pos.x - 1, (int) m_Pos.y, (int) m_Pos.z - 1);
-
m_WaterSpeed *= 0.9f; //Keep old speed but lower it
switch(WaterDir)