From 6bb5405296217942eea51c47c98c5cb424b4be2f Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 28 Jun 2020 22:20:11 +0200 Subject: [PATCH] Core/Movement: removed unnecessary logging from f1b16b482009eb224196acbc46cfb198d5b1859a --- src/server/game/Entities/Unit/Unit.cpp | 2 +- .../MovementGenerators/FollowMovementGenerator.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 24ea3cdf20..c9beaa1a79 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9239,7 +9239,7 @@ void Unit::RemoveFormationFollower(Unit* follower) if (!follwingUnit || follwingUnit == follower) itr = _formationFollowers.erase(itr); else - itr++; + ++itr; } } diff --git a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp index 3782995898..e0128cb87d 100644 --- a/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FollowMovementGenerator.cpp @@ -18,7 +18,6 @@ #include "FollowMovementGenerator.h" #include "CreatureAI.h" #include "EventProcessor.h" -#include "Log.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "PathGenerator.h" @@ -277,12 +276,6 @@ void FollowMovementGenerator::UpdateFollowFormation() uint8 followSlot = 0; for (Unit* follower : _target->GetFormationFollowers()) { - if (!follower) - { - TC_LOG_ERROR("movement.motionmaster", "Unit (%s) has a invalid follower reference in its formation follower container.", _target->GetGUID().ToString().c_str()); - continue; - } - for (uint8 slot = MOTION_SLOT_IDLE; slot < MAX_MOTION_SLOT; ++slot) { MovementGenerator* moveGen = follower->GetMotionMaster()->GetMotionSlot(MovementSlot(slot));