diff options
| author | jackpoz <giacomopoz@gmail.com> | 2019-10-20 12:25:14 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2019-10-20 12:25:14 +0200 |
| commit | 84937337da571c6559d4053145fdc3a21450168d (patch) | |
| tree | e311dccaa4a8f39d18235dec28cc4de1683e1c8a | |
| parent | 9941b4c2edcf63e6e521249a6660b590f23cd08d (diff) | |
Revert "Core/Movement: Fix a crash on login"
This reverts commit 9941b4c2edcf63e6e521249a6660b590f23cd08d.
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Movement/MotionMaster.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 446ed1f97b7..687fbca4471 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -83,7 +83,7 @@ bool MovementGeneratorComparator::operator()(MovementGenerator const* a, Movemen MovementGeneratorInformation::MovementGeneratorInformation(MovementGeneratorType type, ObjectGuid targetGUID, std::string const& targetName) : Type(type), TargetGUID(targetGUID), TargetName(targetName) { } -MotionMaster::MotionMaster(Unit* unit) : _owner(unit), _defaultGenerator(nullptr), _flags(MOTIONMASTER_FLAG_NONE), _defaultInitialized(false) { } +MotionMaster::MotionMaster(Unit* unit) : _owner(unit), _defaultGenerator(nullptr), _flags(MOTIONMASTER_FLAG_NONE) { } MotionMaster::~MotionMaster() { @@ -110,7 +110,6 @@ void MotionMaster::Initialize() void MotionMaster::InitializeDefault() { - _defaultInitialized = true; Add(FactorySelector::SelectMovementGenerator(_owner), MOTION_SLOT_DEFAULT); } @@ -323,7 +322,7 @@ void MotionMaster::Add(MovementGenerator* movement, MovementSlot slot/* = MOTION return; } - if (HasFlag(MOTIONMASTER_FLAG_UPDATE) || !_defaultInitialized) + if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { DelayedActionDefine action = [this, movement, slot]() { diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 911ac0b29fb..4db648d7d1f 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -218,7 +218,6 @@ class TC_GAME_API MotionMaster MotionMasterUnitStatesContainer _baseUnitStatesMap; std::deque<DelayedAction> _delayedActions; uint8 _flags; - bool _defaultInitialized; }; #endif // MOTIONMASTER_H |