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

Merge pull request #3102 from LogicParrot/burn

Browse Source 
Manual mob burn code
This commit is contained in:
LogicParrot 2016-04-06 09:33:27 +03:00
commit 3950e4db51
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mobs/Monster.cpp
View File

@ -1191,24 +1191,51 @@ bool cMonster::WouldBurnAt(Vector3d a_Location, cChunk & a_Chunk)
// Always burn above the world // Always burn above the world
return true; return true;
} }
if (RelY <= 0)
{
// The mob is about to die, no point in burning
return false;
}
cChunk * Chunk = a_Chunk.GetNeighborChunk(FloorC(a_Location.x), FloorC(a_Location.z)); PREPARE_REL_AND_CHUNK(a_Location, a_Chunk);
if ((Chunk == nullptr) || (!Chunk->IsValid())) if (!RelSuccess)
{ {
return false; return false;
} }
int RelX = FloorC(a_Location.x) - Chunk->GetPosX() * cChunkDef::Width;
int RelZ = FloorC(a_Location.z) - Chunk->GetPosZ() * cChunkDef::Width;
if ( if (
(Chunk->GetSkyLight(RelX, RelY, RelZ) == 15) && // In the daylight (Chunk->GetBlock(Rel.x, Rel.y, Rel.z) != E_BLOCK_SOULSAND) && // Not on soulsand
(Chunk->GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand
(GetWorld()->GetTimeOfDay() < 12000 + 1000) && // Daytime (GetWorld()->GetTimeOfDay() < 12000 + 1000) && // Daytime
GetWorld()->IsWeatherSunnyAt(POSX_TOINT, POSZ_TOINT) // Not raining GetWorld()->IsWeatherSunnyAt(POSX_TOINT, POSZ_TOINT) // Not raining
) )
{ {
int MobHeight = static_cast<int>(a_Location.y) + round(GetHeight()) - 1; // The height of the mob head
if (MobHeight >= cChunkDef::Height)
{
return true;
}
// Start with the highest block and scan down to the mob's head.
// If a non transparent is found, return false (do not burn). Otherwise return true.
// Note that this loop is not a performance concern as transparent blocks are rare and the loop almost always bailes out
// instantly.(An exception is e.g. standing under a long column of glass).
int CurrentBlock = Chunk->GetHeight(Rel.x, Rel.z);
while (CurrentBlock >= MobHeight)
{
BLOCKTYPE Block = Chunk->GetBlock(Rel.x, CurrentBlock, Rel.z);
if (
// Do not burn if a block above us meets one of the following conditions:
(!cBlockInfo::IsTransparent(Block)) ||
(Block == E_BLOCK_LEAVES) ||
(Block == E_BLOCK_NEW_LEAVES) ||
(IsBlockWater(Block))
)
{
return false;
}
--CurrentBlock;
}
return true; return true;
} }
return false; return false;
} }