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

Fixed squid crashing the server when above or below the world

Browse Source
This commit is contained in:
madmaxoft 2013-08-09 15:53:43 +02:00
parent c85acd4ece
commit 72e2891017
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/Mobs/Squid.cpp
View File

@ -36,9 +36,14 @@ void cSquid::Tick(float a_Dt, cChunk & a_Chunk)
Vector3d Pos = GetPosition(); Vector3d Pos = GetPosition();
// TODO: Not a real behavior, but cool :D // TODO: Not a real behavior, but cool :D
int RelY = (int)floor(Pos.y);
if ((RelY < 0) || (RelY >= cChunkDef::Height))
{
return;
}
int RelX = (int)floor(Pos.x) - a_Chunk.GetPosX() * cChunkDef::Width; int RelX = (int)floor(Pos.x) - a_Chunk.GetPosX() * cChunkDef::Width;
int RelZ = (int)floor(Pos.z) - a_Chunk.GetPosZ() * cChunkDef::Width; int RelZ = (int)floor(Pos.z) - a_Chunk.GetPosZ() * cChunkDef::Width;
if (!IsBlockWater(a_Chunk.GetBlock(RelX, (int)floor(Pos.y), RelZ)) && !IsOnFire()) if (!IsBlockWater(a_Chunk.GetBlock(RelX, RelY, RelZ)) && !IsOnFire())
{ {
// Burn for 10 ticks, then decide again // Burn for 10 ticks, then decide again
StartBurning(10); StartBurning(10);