nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-25 22:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
郑佩茹
2022-06-21 13:24:33 -06:00
parent 98c22aa96d
commit 67e9f2fd35
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -3461,8 +3461,6 @@ bool Creature::SetCannotReachTarget(bool cannotReach, bool isChase /*= true*/)
if (cannotReach) if (cannotReach)
LOG_DEBUG("entities.unit", "Creature::SetCannotReachTarget() called with true. Details: {}", GetDebugInfo()); LOG_DEBUG("entities.unit", "Creature::SetCannotReachTarget() called with true. Details: {}", GetDebugInfo());
return true;
} }
time_t Creature::GetLastDamagedTime() const time_t Creature::GetLastDamagedTime() const

1
src/server/game/Entities/Creature/Creature.h
View File

@@ -456,6 +456,7 @@ private:
mutable std::shared_ptr<time_t> _lastDamagedTime; // Part of Evade mechanics mutable std::shared_ptr<time_t> _lastDamagedTime; // Part of Evade mechanics
bool m_cannotReachTarget;
uint32 m_cannotReachTimer; uint32 m_cannotReachTimer;
Spell const* _focusSpell; ///> Locks the target during spell cast for proper facing Spell const* _focusSpell; ///> Locks the target during spell cast for proper facing