summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-28 00:13:26 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-28 00:13:26 +0200
commitb6df30831d6b9b84bbb231dd8cfe4c1532666da4 (patch)
tree5e77ef5e513e419e7cc53eff3aec3e0af125f6b8 /src
parentAdded generic entity-collecting. (diff)
downloadcuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.tar
cuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.tar.gz
cuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.tar.bz2
cuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.tar.lz
cuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.tar.xz
cuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.tar.zst
cuberite-b6df30831d6b9b84bbb231dd8cfe4c1532666da4.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index ee7ce06ac..2b256e766 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1090,7 +1090,10 @@ void cEntity::HandleAir(void)
if (IsSubmerged())
{
- SetSpeedY(1); // Float in the water
+ if (!IsPlayer()) // Players control themselves
+ {
+ SetSpeedY(1); // Float in the water
+ }
// Either reduce air level or damage player
if (m_AirLevel < 1)