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

Merge branch 'master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/Entities/Player/Player.h
This commit is contained in:
郑佩茹
2023-03-16 10:00:13 -06:00
parent 328d991305 6415b2ae1f
commit be7c57507f
325 changed files with 12322 additions and 7378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Unit/Unit.h
View File

@@ -1337,7 +1337,7 @@ public:
void Update(uint32 time) override;
void setAttackTimer(WeaponAttackType type, int32 time) { m_attackTimer[type] = time; }
void setAttackTimer(WeaponAttackType type, int32 time) { m_attackTimer[type] = time; } /// @todo - Look to convert to std::chrono
void resetAttackTimer(WeaponAttackType type = BASE_ATTACK);
[[nodiscard]] int32 getAttackTimer(WeaponAttackType type) const { return m_attackTimer[type]; }
[[nodiscard]] bool isAttackReady(WeaponAttackType type = BASE_ATTACK) const { return m_attackTimer[type] <= 0; }
@@ -2467,6 +2467,8 @@ public:
bool m_cannotReachTarget;
[[nodiscard]] uint32 GetOldFactionId() const { return _oldFactionId; }
protected:
explicit Unit (bool isWorldObject);