Merge branch 'master' into Playerbot

2024-04-07 21:49:34 +08:00
parent d74a6dd960 8ef8ddad24
commit f0be01a5d7
45 changed files with 1497 additions and 755 deletions
@@ -113,6 +113,8 @@ void BattlegroundEY::AddPoints(TeamId teamId, uint32 points)
 {
    uint8 honorRewards = uint8(m_TeamScores[teamId] / _honorTics);
    m_TeamScores[teamId] += points;
+    if (m_TeamScores[teamId] > BG_EY_MAX_TEAM_SCORE)
+        m_TeamScores[teamId] = BG_EY_MAX_TEAM_SCORE;

    for (; honorRewards < uint8(m_TeamScores[teamId] / _honorTics); ++honorRewards)
        RewardHonorToTeam(GetBonusHonorFromKill(1), teamId);