aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2019-02-10 17:04:04 +0100
committerGitHub <noreply@github.com>2019-02-10 17:04:04 +0100
commitba5a9f2b361a2fa01d1a3396999a5833983c0f4a (patch)
treefbd24e3f70b08e687042d3fe95705a3200bfd121
parenta809f7361e8a7232b3c9ec241be5adcae96b3b2d (diff)
downloadminetest-ba5a9f2b361a2fa01d1a3396999a5833983c0f4a.tar.gz
minetest-ba5a9f2b361a2fa01d1a3396999a5833983c0f4a.tar.bz2
minetest-ba5a9f2b361a2fa01d1a3396999a5833983c0f4a.zip
Slippery: Do not apply when swimming (#8198)
-rw-r--r--src/client/localplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index c627cc6d9..7e7b1a867 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -689,7 +689,7 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
incH = incV = movement_acceleration_default * BS * dtime;
float slip_factor = 1.0f;
- if (!free_move)
+ if (!free_move && !in_liquid && !in_liquid_stable)
slip_factor = getSlipFactor(env, speedH);
// Don't sink when swimming in pitch mode