flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix crash for players out of the world. Fixes #4006 (#4007)

Browse Source
This commit is contained in:
Alexander Harkness 2017-09-10 17:45:18 +01:00 committed by GitHub
parent c334824199
commit 4e7325c9e2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Entities/Entity.cpp
View File

@ -1662,7 +1662,9 @@ bool cEntity::MoveToWorld(const AString & a_WorldName, bool a_ShouldSendRespawn)
void cEntity::SetSwimState(cChunk & a_Chunk) void cEntity::SetSwimState(cChunk & a_Chunk)
{ {
int RelY = FloorC(GetPosY() + 0.1); int RelY = FloorC(GetPosY() + 0.1);
if ((RelY < 0) || (RelY >= cChunkDef::Height - 1)) int HeadRelY = CeilC(GetPosY() + GetHeight()) - 1;
ASSERT(RelY <= HeadRelY);
if ((RelY < 0) || (HeadRelY >= cChunkDef::Height))
{ {
m_IsSwimming = false; m_IsSwimming = false;
m_IsSubmerged = false; m_IsSubmerged = false;
@ -1688,8 +1690,7 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
m_IsSwimming = IsBlockWater(BlockIn); m_IsSwimming = IsBlockWater(BlockIn);
// Check if the player is submerged: // Check if the player is submerged:
int HeadHeight = CeilC(GetPosY() + GetHeight()) - 1; VERIFY(a_Chunk.UnboundedRelGetBlockType(RelX, HeadRelY, RelZ, BlockIn));
VERIFY(a_Chunk.UnboundedRelGetBlockType(RelX, HeadHeight, RelZ, BlockIn));
m_IsSubmerged = IsBlockWater(BlockIn); m_IsSubmerged = IsBlockWater(BlockIn);
} }