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: moved the cleanup of the idle motion slot to CleanupBeforeRemoveFromMap

Browse Source
This commit is contained in:
Ovahlord
2020-06-29 12:15:17 +02:00
parent b4c4f82dd8
commit 696ab70f7f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -10449,8 +10449,6 @@ void Unit::RemoveFromWorld()
RemoveAreaAurasDueToLeaveWorld();
GetMotionMaster()->Clear(MOTION_SLOT_IDLE); // clear idle movement slot to finalize follow movement to unregister formation targets
if (GetCharmerGUID())
{
TC_LOG_FATAL("entities.unit", "Unit %u has charmer guid when removed from world", GetEntry());
@@ -10476,6 +10474,9 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup)
// This needs to be before RemoveFromWorld to make GetCaster() return a valid pointer on aura removal
InterruptNonMeleeSpells(true);
// clear idle movement slot to finalize follow movement to unregister formation targets
GetMotionMaster()->Clear(MOTION_SLOT_IDLE);
if (IsInWorld())
RemoveFromWorld();