Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2023-10-27 20:12:09 +08:00
64 changed files with 658 additions and 686 deletions

View File

@@ -2581,7 +2581,7 @@ private:
uint32 m_state; // Even derived shouldn't modify
uint32 m_CombatTimer;
uint32 m_lastManaUse; // msecs
//TimeTrackerSmall m_movesplineTimer;
TimeTrackerSmall m_splineSyncTimer;
Diminishing m_Diminishing;
// Manage all Units that are threatened by us