Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/MMaps: Fix infinite loop in Detour

Browse Source 
Fix an infinite loop in Detour happening in Dalaran Sewers.
This is more of an emergency patch until we figure out why dtNodes have a circular reference (A -> B -> C -> A) happening quite often in this place
This commit is contained in:
jackpoz
2019-02-06 19:32:31 +01:00
parent 3a83dc60d5
commit c8ec2dd95d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
View File

@@ -26,6 +26,7 @@
#include "DetourAlloc.h"
#include "DetourAssert.h"
#include <new>
#include <unordered_set>
/// @class dtQueryFilter
///
@@ -1206,10 +1207,16 @@ dtStatus dtNavMeshQuery::getPathToNode(dtNode* endNode, dtPolyRef* path, int* pa
// Find the length of the entire path.
dtNode* curNode = endNode;
int length = 0;
std::unordered_set<int> processedIds;
bool alreadyProcessed = false;
do
{
length++;
alreadyProcessed = !processedIds.insert(curNode->pidx).second;
if (alreadyProcessed)
return DT_FAILURE;
curNode = m_nodePool->getNodeAtIdx(curNode->pidx);
} while (curNode);
// If the path cannot be fully stored then advance to the last node we will be able to store.

2
src/server/game/Movement/PathGenerator.cpp
View File

@@ -395,7 +395,7 @@ void PathGenerator::BuildPolyPath(G3D::Vector3 const& startPos, G3D::Vector3 con
// this is probably an error state, but we'll leave it
// and hopefully recover on the next Update
// we still need to copy our preffix
TC_LOG_ERROR("maps", "%u's Path Build failed: 0 length path", _sourceUnit->GetGUID().GetCounter());
TC_LOG_ERROR("maps", "Path Build failed\n%s", _sourceUnit->GetDebugInfo().c_str());
}
TC_LOG_DEBUG("maps", "++ m_polyLength=%u prefixPolyLength=%u suffixPolyLength=%u \n", _polyLength, prefixPolyLength, suffixPolyLength);