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

Core/Movement: fixed a crash in MotionMaster that was caused in combination with MovementInform and DoZoneInCombat

Browse Source
This commit is contained in:
Ovahlord
2019-08-04 03:24:19 +02:00
parent d91243190c
commit f526fc9768
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,10 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
if (empty())
return IDLE_MOTION_TYPE;
return top()->GetMovementGeneratorType();
if (topOrNull())
return top()->GetMovementGeneratorType();
else
return IDLE_MOTION_TYPE;
}
MovementGeneratorType MotionMaster::GetMotionSlotType(MovementSlot slot) const