From 67e9f2fd359426507a25c6d5b511e2be0ab400a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Tue, 21 Jun 2022 13:24:33 -0600 Subject: [PATCH] Fix merge conflicts --- src/server/game/Entities/Creature/Creature.cpp | 2 -- src/server/game/Entities/Creature/Creature.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 21643ac2b..47d29b0e9 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3461,8 +3461,6 @@ bool Creature::SetCannotReachTarget(bool cannotReach, bool isChase /*= true*/) if (cannotReach) LOG_DEBUG("entities.unit", "Creature::SetCannotReachTarget() called with true. Details: {}", GetDebugInfo()); - - return true; } time_t Creature::GetLastDamagedTime() const diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index e940e63ba..f3ee608a5 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -456,6 +456,7 @@ private: mutable std::shared_ptr _lastDamagedTime; // Part of Evade mechanics + bool m_cannotReachTarget; uint32 m_cannotReachTimer; Spell const* _focusSpell; ///> Locks the target during spell cast for proper facing