aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement/MotionMaster.cpp
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-10-02 19:53:55 +0200
committerTreeston <treeston.mmoc@gmail.com>2018-10-02 19:53:55 +0200
commitead439fbd6620ab53530c3d1d28b4755280a1059 (patch)
treefe982264b80c0a0d7f71b980cd87add5701f9202 /src/server/game/Movement/MotionMaster.cpp
parentdbf25d554828330a1c8c4ae501ff5c23891e9fbe (diff)
Core/Movement: Add some extra assertions to MotionMaster to catch issues like #22444 earlier in the future.
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index ebccc6fa481..018550c079e 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -950,7 +950,8 @@ void MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveTaxiFlight: '%s', taxi to path Id: %u (node %u)", _owner->GetGUID().ToString().c_str(), path, pathnode);
// Only one FLIGHT_MOTION_TYPE is allowed
- Remove(FLIGHT_MOTION_TYPE);
+ bool hasExisting = HasMovementGenerator([](MovementGenerator const* gen) { return gen->GetMovementGeneratorType() == FLIGHT_MOTION_TYPE; });
+ ASSERT(!hasExisting, "Duplicate flight path movement generator");
FlightPathMovementGenerator* movement = new FlightPathMovementGenerator(pathnode);
movement->LoadPath(_owner->ToPlayer());