diff options
| -rwxr-xr-x | src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 421ca1b8d69..f9811a551e0 100755 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -93,6 +93,14 @@ bool ConfusedMovementGenerator<T>::DoUpdate(T* owner, uint32 diff) float angle = frand(0.0f, 1.0f) * float(M_PI) * 2.0f; owner->MovePositionToFirstCollision(destination, distance, angle); + // Check if the destination is in LOS + if (!owner->IsWithinLOS(destination.GetPositionX(), destination.GetPositionY(), destination.GetPositionZ())) + { + // Retry later on + _timer.Reset(200); + return true; + } + if (!_path) { _path = std::make_unique<PathGenerator>(owner); diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index c4235f5b592..36d830e2856 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -124,6 +124,14 @@ void RandomMovementGenerator<Creature>::SetRandomLocation(Creature* owner) float angle = frand(0.f, 1.f) * float(M_PI) * 2.f; owner->MovePositionToFirstCollision(position, distance, angle); + // Check if the destination is in LOS + if (!owner->IsWithinLOS(position.GetPositionX(), position.GetPositionY(), position.GetPositionZ())) + { + // Retry later on + _timer.Reset(200); + return; + } + uint32 resetTimer = roll_chance_i(50) ? urand(5000, 10000) : urand(1000, 2000); if (!_path) |