diff options
4 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index b5d04826d85..ed04a2ac274 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8542,7 +8542,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype) if (creature->HasUnitTypeMask(UNIT_MASK_MINION) && !creature->IsInCombat()) { - MovementGenerator* top = creature->GetMotionMaster()->top(); + MovementGenerator* top = creature->GetMotionMaster()->topOrNull(); if (top && top->GetMovementGeneratorType() == FOLLOW_MOTION_TYPE) { Unit* followed = ASSERT_NOTNULL(dynamic_cast<AbstractFollower*>(top))->GetTarget(); diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index fa465319cdb..4fdb018bebc 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -129,6 +129,7 @@ class TC_GAME_API MotionMaster bool empty() const { return (_top < 0); } int size() const { return _top + 1; } + MovementGenerator* topOrNull() const { return empty() ? nullptr : top(); } MovementGenerator* top() const { ASSERT(!empty()); return _slot[_top]; } void Initialize(); diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp index a84139cca2d..230edbdc861 100644 --- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp @@ -26,7 +26,7 @@ static bool IsMutualChase(Unit* owner, Unit* target) { - MovementGenerator const* gen = target->GetMotionMaster()->top(); + MovementGenerator const* gen = target->GetMotionMaster()->topOrNull(); if (!gen || gen->GetMovementGeneratorType() != CHASE_MOTION_TYPE) return false; return (static_cast<ChaseMovementGenerator const*>(gen)->GetTarget() == owner); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index e6c980a7731..90dc0d335ee 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -1830,7 +1830,7 @@ class spell_pal_righteous_defense : public SpellScript return SPELL_CAST_OK; } - void HandleDummy(SpellEffIndex effIndex) + void HandleDummy(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) { |