summaryrefslogtreecommitdiffstats
path: root/source/Mobs/Squid.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-07-07 22:20:18 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-07-07 22:20:18 +0200
commit254295b5b8cb34940d77c1c123a2247f6509d813 (patch)
tree81b67203a34129a192a6ca810545615122cdc5ce /source/Mobs/Squid.cpp
parentIce is a solid block. (diff)
downloadcuberite-254295b5b8cb34940d77c1c123a2247f6509d813.tar
cuberite-254295b5b8cb34940d77c1c123a2247f6509d813.tar.gz
cuberite-254295b5b8cb34940d77c1c123a2247f6509d813.tar.bz2
cuberite-254295b5b8cb34940d77c1c123a2247f6509d813.tar.lz
cuberite-254295b5b8cb34940d77c1c123a2247f6509d813.tar.xz
cuberite-254295b5b8cb34940d77c1c123a2247f6509d813.tar.zst
cuberite-254295b5b8cb34940d77c1c123a2247f6509d813.zip
Diffstat (limited to 'source/Mobs/Squid.cpp')
-rw-r--r--source/Mobs/Squid.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/Mobs/Squid.cpp b/source/Mobs/Squid.cpp
index 09236f3c5..76b1ed94f 100644
--- a/source/Mobs/Squid.cpp
+++ b/source/Mobs/Squid.cpp
@@ -30,18 +30,21 @@ void cSquid::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSquid::Tick(float a_Dt, cChunk & a_Chunk)
{
- super::Tick(a_Dt, a_Chunk);
+ // We must first process current location, and only then tick, otherwise we risk processing a location in a chunk
+ // that is not where the entity currently resides (FS #411)
Vector3d Pos = GetPosition();
// TODO: Not a real behavior, but cool :D
- int RelX = (int)floor(Pos.x + 0.5) - a_Chunk.GetPosX() * cChunkDef::Width;
- int RelZ = (int)floor(Pos.z + 0.5) - a_Chunk.GetPosZ() * cChunkDef::Width;
- if (!IsBlockWater(a_Chunk.GetBlock(RelX, (int)Pos.y, RelZ)) && !IsOnFire())
+ 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())
{
// Burn for 10 ticks, then decide again
StartBurning(10);
}
+
+ super::Tick(a_Dt, a_Chunk);
}