Merge branch 'master' into Playerbot

src/server/game/Battlegrounds/Battleground.cpp

@@ -916,9 +916,49 @@ void Battleground::EndBattleground(PvPTeamId winnerTeamId)
         player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND, player->GetMapId());
     }
 
+    if (IsEventActive(EVENT_SPIRIT_OF_COMPETITION) && isBattleground())
+        SpiritofCompetitionEvent(winnerTeamId);
+
     sScriptMgr->OnBattlegroundEnd(this, GetTeamId(winnerTeamId));
 }
 
+bool Battleground::SpiritofCompetitionEvent(PvPTeamId winnerTeamId)
+{
+    // Everyone is eligible for tabard reward
+    for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        Player* player = itr->second;
+        bool questStatus = player->GetQuestStatus(QUEST_FLAG_PARTICIPANT) != QUEST_STATUS_REWARDED;
+
+        if (player && questStatus)
+            player->CastSpell(player, SPELL_SPIRIT_OF_COMPETITION_PARTICIPANT, true);
+    }
+
+    // In case of a draw nobody get rewarded
+    if (winnerTeamId == PVP_TEAM_NEUTRAL)
+        return false;
+
+    std::vector<Player*> filteredPlayers;
+
+    for (BattlegroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
+    {
+        Player* player = itr->second;
+        bool playerTeam = player->GetBgTeamId() == GetTeamId(winnerTeamId);
+        bool questStatus = player->GetQuestStatus(QUEST_FLAG_WINNER) != QUEST_STATUS_REWARDED;
+
+        if (player && playerTeam && questStatus)
+            filteredPlayers.push_back(player);
+    }
+
+    if (filteredPlayers.size())
+    {
+        if (Player* wPlayer = filteredPlayers[rand() % filteredPlayers.size()])
+            wPlayer->CastSpell(wPlayer, SPELL_SPIRIT_OF_COMPETITION_WINNER, true);
+    }
+
+    return true;
+}
+
 uint32 Battleground::GetBonusHonorFromKill(uint32 kills) const
 {
     //variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill)

src/server/game/Battlegrounds/Battleground.h

@@ -238,6 +238,15 @@ enum BattlegroundStartingEventsIds
     BG_STARTING_EVENT_FOURTH        = 3
 };
 
+enum SpiritOfCompetitionEvent
+{
+    EVENT_SPIRIT_OF_COMPETITION             = 46,
+    QUEST_FLAG_PARTICIPANT                  = 12187,
+    QUEST_FLAG_WINNER                       = 12186,
+    SPELL_SPIRIT_OF_COMPETITION_PARTICIPANT = 48163,
+    SPELL_SPIRIT_OF_COMPETITION_WINNER      = 48164,
+};
+
 constexpr auto BG_STARTING_EVENT_COUNT = 4;
 
 class ArenaLogEntryData
@@ -338,6 +347,9 @@ public:
     [[nodiscard]] uint32 GetScriptId() const          { return ScriptId; }
     [[nodiscard]] uint32 GetBonusHonorFromKill(uint32 kills) const;
 
+    // Spirit of Competition event
+    bool SpiritofCompetitionEvent(PvPTeamId winnerTeamId);
+
     bool IsRandom() { return m_IsRandom; }
 
     // Set methods: