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

Squid: fixed a possible crash caused by access to a wrong chunk

Browse Source 
Fixes FS #411.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1665 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-07-07 20:20:18 +00:00
parent a72c6d9613
commit 254295b5b8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Mobs/Squid.cpp
View File

@ -30,18 +30,21 @@ void cSquid::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSquid::Tick(float a_Dt, cChunk & a_Chunk) 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(); Vector3d Pos = GetPosition();
// TODO: Not a real behavior, but cool :D // TODO: Not a real behavior, but cool :D
int RelX = (int)floor(Pos.x + 0.5) - a_Chunk.GetPosX() * cChunkDef::Width; int RelX = (int)floor(Pos.x) - a_Chunk.GetPosX() * cChunkDef::Width;
int RelZ = (int)floor(Pos.z + 0.5) - a_Chunk.GetPosZ() * cChunkDef::Width; int RelZ = (int)floor(Pos.z) - a_Chunk.GetPosZ() * cChunkDef::Width;
if (!IsBlockWater(a_Chunk.GetBlock(RelX, (int)Pos.y, RelZ)) && !IsOnFire()) if (!IsBlockWater(a_Chunk.GetBlock(RelX, (int)floor(Pos.y), RelZ)) && !IsOnFire())
{ {
// Burn for 10 ticks, then decide again // Burn for 10 ticks, then decide again
StartBurning(10); StartBurning(10);
} }
super::Tick(a_Dt, a_Chunk);
} }