aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-09-07 18:22:26 +0200
committerjackpoz <giacomopoz@gmail.com>2019-09-07 18:22:26 +0200
commit680e1cbd6cf7c52abe104fb87d8fa6dba83fb633 (patch)
tree67b60381889675bf9065a395bb840de1dfebaf3a /src
parentc892f867d578a0d847979135c9191fbdb8be805b (diff)
Core/MovementGenerator: Fix crash in taxi paths
Fix a crash in taxi paths happening when joining a battleground/dungeon while on a taxi path after second last node but close to last node, then leaving/finishing the battleground.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp
index 49eb3422cb5..bc84dacc3e4 100644
--- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp
@@ -93,7 +93,7 @@ bool FlightPathMovementGenerator::DoUpdate(Player* owner, uint32 /*diff*/)
return false;
uint32 pointId = owner->movespline->currentPathIdx() < 0 ? 0 : owner->movespline->currentPathIdx();
- if (pointId > _currentNode)
+ if (pointId > _currentNode && _currentNode < _path.size())
{
bool departureEvent = true;
do
@@ -112,7 +112,7 @@ bool FlightPathMovementGenerator::DoUpdate(Player* owner, uint32 /*diff*/)
}
}
- if (pointId == _currentNode)
+ if (pointId >= _currentNode)
break;
if (_currentNode == _preloadTargetNode)