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

Merge pull request #1946 from SafwatHalaby/lean

Browse Source 
PathFinder - Couple of bugfixes
This commit is contained in:
Alexander Harkness 2015-05-06 07:38:31 +01:00
commit bd73dcedd4
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mobs/Monster.cpp
View File

@ -143,10 +143,11 @@ bool cMonster::TickPathFinding(cChunk & a_Chunk)
{
/* If we reached the last path waypoint,
Or if we haven't re-calculated for too long.
Interval is proportional to distance squared. (Recalculate lots when close, calculate rarely when far) */
Interval is proportional to distance squared, and its minimum is 10.
(Recalculate lots when close, calculate rarely when far) */
if (
((GetPosition() - m_PathFinderDestination).Length() < 0.25) ||
m_TicksSinceLastPathReset > (0.15 * (m_FinalDestination - GetPosition()).SqrLength())
((m_TicksSinceLastPathReset > 10) && (m_TicksSinceLastPathReset > (0.15 * (m_FinalDestination - GetPosition()).SqrLength())))
)
{
ResetPathFinding();

14
src/Mobs/Path.cpp
View File

@ -60,12 +60,12 @@ cPath::cPath(
{
BLOCKTYPE BlockType;
NIBBLETYPE BlockMeta;
int RelX = m_Destination.x - m_Chunk->GetPosX() * cChunkDef::Width;
int RelZ = m_Destination.z - m_Chunk->GetPosZ() * cChunkDef::Width;
int RelX = m_Destination.x - Chunk->GetPosX() * cChunkDef::Width;
int RelZ = m_Destination.z - Chunk->GetPosZ() * cChunkDef::Width;
bool inwater = false;
for (;;)
{
m_Chunk->GetBlockTypeMeta(RelX, m_Destination.y, RelZ, BlockType, BlockMeta);
Chunk->GetBlockTypeMeta(RelX, m_Destination.y, RelZ, BlockType, BlockMeta);
if (BlockType != E_BLOCK_STATIONARY_WATER)
{
break;
@ -182,7 +182,13 @@ bool cPath::Step_Internal()
}
// Path found.
if (CurrentCell->m_Location == m_Destination)
if (
(CurrentCell->m_Location == m_Destination + Vector3i(0, 0, 1)) ||
(CurrentCell->m_Location == m_Destination + Vector3i(1, 0, 0)) ||
(CurrentCell->m_Location == m_Destination + Vector3i(-1, 0, 0)) ||
(CurrentCell->m_Location == m_Destination + Vector3i(0, 0, -1)) ||
(CurrentCell->m_Location == m_Destination + Vector3i(0, -1, 0))
)
{
do
{