summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-10-31 16:12:49 +0100
committerAlexander Harkness <me@bearbin.net>2015-10-31 16:12:49 +0100
commit9c270d522cc1cb62d95d87fd1ffc4e82954f4204 (patch)
tree0d4456d5b72ce8bb3594c62b592cb88901d16dc2 /src
parentMerge pull request #2581 from bibo38/clangfix (diff)
parentDebug mode: Fixed assertion, if player below y < 0 (diff)
downloadcuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.tar
cuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.tar.gz
cuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.tar.bz2
cuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.tar.lz
cuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.tar.xz
cuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.tar.zst
cuberite-9c270d522cc1cb62d95d87fd1ffc4e82954f4204.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/Player.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 57bf382d4..bc8a0db51 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -465,7 +465,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
!IsSwimming() && !IsFlying() &&
(
(
- ((GetPosY() >= 1) && ((GetPosY() - POSY_TOINT) <= EPS)) &&
+ ((GetPosY() >= 1) && (GetPosY() <= 255) && ((GetPosY() - POSY_TOINT) <= EPS)) &&
(
cBlockInfo::IsSolid(GetWorld()->GetBlock((GetPosition() + Vector3d(0, -1, 0)).Floor())) ||
cBlockInfo::IsSolid(GetWorld()->GetBlock((GetPosition() + Vector3d(HalfWidth, -1, 0)).Floor())) ||
@@ -475,7 +475,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
)
) ||
(
- ((GetPosY() >= POSY_TOINT) && ((GetPosY() - (POSY_TOINT + 0.5)) <= EPS)) &&
+ (((GetPosY() >= 1) && (GetPosY() <= 255) && GetPosY() >= POSY_TOINT) && ((GetPosY() - (POSY_TOINT + 0.5)) <= EPS)) &&
(
cBlockSlabHandler::IsAnySlabType(GetWorld()->GetBlock((GetPosition() + Vector3d(0, 0, 0)).Floor())) ||
cBlockSlabHandler::IsAnySlabType(GetWorld()->GetBlock((GetPosition() + Vector3d(HalfWidth, 0, 0)).Floor())) ||
@@ -485,7 +485,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
)
) ||
(
- (fmod(GetPosY(), 0.125) <= EPS) &&
+ ((GetPosY() >= 1) && (GetPosY() <= 255) && fmod(GetPosY(), 0.125) <= EPS) &&
(
(GetWorld()->GetBlock((GetPosition() + Vector3d(0, 0, 0)).Floor()) == E_BLOCK_SNOW) ||
(GetWorld()->GetBlock((GetPosition() + Vector3d(HalfWidth, 0, 0)).Floor()) == E_BLOCK_SNOW) ||