From 7c9c51425b465a0a7ad19438609ef4cdd832a839 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Fri, 9 Aug 2013 15:53:43 +0200 Subject: Fixed squid crashing the server when above or below the world --- source/Mobs/Squid.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/Mobs/Squid.cpp') diff --git a/source/Mobs/Squid.cpp b/source/Mobs/Squid.cpp index 76b1ed94f..cb796f5ec 100644 --- a/source/Mobs/Squid.cpp +++ b/source/Mobs/Squid.cpp @@ -36,9 +36,14 @@ void cSquid::Tick(float a_Dt, cChunk & a_Chunk) Vector3d Pos = GetPosition(); // 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 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 StartBurning(10); -- cgit v1.2.3