summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-09 15:53:43 +0200
committermadmaxoft <github@xoft.cz>2013-08-09 15:53:43 +0200
commit7c9c51425b465a0a7ad19438609ef4cdd832a839 (patch)
treea47ff711282c8ac659c49a631600782b655e3521
parentRenamed Plugin_NewLua to PluginLua. (diff)
downloadcuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.tar
cuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.tar.gz
cuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.tar.bz2
cuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.tar.lz
cuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.tar.xz
cuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.tar.zst
cuberite-7c9c51425b465a0a7ad19438609ef4cdd832a839.zip
-rw-r--r--source/Mobs/Squid.cpp7
1 files changed, 6 insertions, 1 deletions
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);