From 426f9f2f92b26fbb68e7cda9290ccbd586c6af4e Mon Sep 17 00:00:00 2001 From: ccrs Date: Sun, 3 Jun 2018 10:06:57 -0700 Subject: Core/Movement: MotionMaster reimplementation (#21888) Internal structure and handling changes, nothing behavioural (or thats the intention at least). (cherry picked from commit 982643cd96790ffc54e7a3e507469649f3b074d2) --- src/server/game/Maps/Map.cpp | 2 +- src/server/game/Maps/MapScripts.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/server/game/Maps') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index ad84dd0e38c..3e935230c24 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1642,7 +1642,7 @@ bool Map::CreatureRespawnRelocation(Creature* c, bool diffGridOnly) if (CreatureCellRelocation(c, resp_cell)) { c->Relocate(resp_x, resp_y, resp_z, resp_o); - c->GetMotionMaster()->Initialize(); // prevent possible problems with default move generators + c->GetMotionMaster()->Initialize(); // prevent possible problems with default move generators //CreatureRelocationNotify(c, resp_cell, resp_cell.GetCellCoord()); c->UpdatePositionData(); c->UpdateObjectVisibility(false); diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index ad2c744b844..c82bb7212fa 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -849,7 +849,6 @@ void Map::ScriptsProcess() if (!cSource->IsAlive()) return; - cSource->GetMotionMaster()->MovementExpired(); cSource->GetMotionMaster()->MoveIdle(); switch (step.script->Movement.MovementType) -- cgit v1.2.3