Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: crashfix

Browse Source 
New movement -> Mutate -> Finish current for that slot that happens to be the same type, Follow -> Finish method on the removed movement -> UpdateSpeed call -> search for top -> crash

Closes #21861
This commit is contained in:
ccrs
2018-04-20 12:46:24 +02:00
parent a5df77a9d6
commit bcab5bc4e7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Movement/MotionMaster.cpp
View File

@@ -161,9 +161,13 @@ void MotionMaster::MovementExpired(bool reset /*= true*/)
MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
{
if (empty())
return IDLE_MOTION_TYPE;
return MAX_MOTION_TYPE;
return top()->GetMovementGeneratorType();
MovementGenerator* movement = top();
if (!movement)
return MAX_MOTION_TYPE;
return movement->GetMovementGeneratorType();
}
MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const