Skip to content

Update CFBG_SC.cpp - fix build #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudlud merged 1 commit into from
Feb 16, 2025
Merged

Update CFBG_SC.cpp - fix build #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 5 additions & 25 deletions src/CFBG_SC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,51 +26,37 @@ class CFBG_BG : public BGScript
sCFBG->FitPlayerInTeam(player, true, bg);

if (sCFBG->IsEnableResetCooldowns())
{
player->RemoveArenaSpellCooldowns(true);
}
}

void OnBattlegroundEndReward(Battleground* bg, Player* player, TeamId /*winnerTeamId*/) override
{
if (!sCFBG->IsEnableSystem() || !bg || !player || bg->isArena())
{
return;
}

if (sCFBG->IsPlayerFake(player))
{
sCFBG->ClearFakePlayer(player);
}
}

void OnBattlegroundRemovePlayerAtLeave(Battleground* bg, Player* player) override
{
if (!sCFBG->IsEnableSystem() || bg->isArena())
{
return;
}

sCFBG->FitPlayerInTeam(player, false, bg);

if (sCFBG->IsPlayerFake(player))
{
sCFBG->ClearFakePlayer(player);
}
}

void OnAddGroup(BattlegroundQueue* queue, GroupQueueInfo* ginfo, uint32& index, Player* /*leader*/, Group* /*group*/, BattlegroundTypeId /* bgTypeId */, PvPDifficultyEntry const* /* bracketEntry */,
uint8 /* arenaType */, bool /* isRated */, bool /* isPremade */, uint32 /* arenaRating */, uint32 /* matchmakerRating */, uint32 /* arenaTeamId */, uint32 /* opponentsArenaTeamId */) override
{
if (!queue)
{
return;
}

if (sCFBG->IsEnableSystem() && !ginfo->ArenaType && !ginfo->IsRated)
{
index = BG_QUEUE_CFBG;
}

// After rework hook
// sCFBG->OnAddGroupToBGQueue(ginfo, group);
Expand All @@ -84,9 +70,7 @@ class CFBG_BG : public BGScript
bool IsCheckNormalMatch(BattlegroundQueue* queue, Battleground* bg, BattlegroundBracketId bracket_id, uint32 minPlayers, uint32 maxPlayers) override
{
if (!sCFBG->IsEnableSystem() || bg->isArena())
{
return false;
}

return sCFBG->CheckCrossFactionMatch(queue, bracket_id, minPlayers, maxPlayers);
}
Expand All @@ -110,20 +94,16 @@ class CFBG_Player : public PlayerScript
public:
CFBG_Player() : PlayerScript("CFBG_Player") { }

void OnLogin(Player* player) override
void OnPlayerLogin(Player* player) override
{
if (!sCFBG->IsEnableSystem())
{
return;
}

if (player->GetTeamId(true) != player->GetBgTeamId())
{
sCFBG->FitPlayerInTeam(player, player->GetBattleground() && !player->GetBattleground()->isArena(), player->GetBattleground());
}
}

bool CanJoinInBattlegroundQueue(Player* player, ObjectGuid /*BattlemasterGuid*/ , BattlegroundTypeId /*BGTypeID*/, uint8 joinAsGroup, GroupJoinBattlegroundResult& err) override
bool OnPlayerCanJoinInBattlegroundQueue(Player* player, ObjectGuid /*BattlemasterGuid*/ , BattlegroundTypeId /*BGTypeID*/, uint8 joinAsGroup, GroupJoinBattlegroundResult& err) override
{
if (!sCFBG->IsEnableSystem())
return true;
Expand All @@ -143,7 +123,7 @@ class CFBG_Player : public PlayerScript
return true;
}

void OnBeforeUpdate(Player* player, uint32 diff) override
void OnPlayerBeforeUpdate(Player* player, uint32 diff) override
{
if (timeCheck <= diff)
{
Expand All @@ -154,7 +134,7 @@ class CFBG_Player : public PlayerScript
timeCheck -= diff;
}

void OnBeforeSendChatMessage(Player* player, uint32& type, uint32& lang, std::string& /*msg*/) override
void OnPlayerBeforeSendChatMessage(Player* player, uint32& type, uint32& lang, std::string& /*msg*/) override
{
if (!player || !sCFBG->IsEnableSystem())
return;
Expand All @@ -176,7 +156,7 @@ class CFBG_Player : public PlayerScript
lang = LANG_UNIVERSAL;
}

bool OnReputationChange(Player* player, uint32 factionID, int32& standing, bool /*incremental*/) override
bool OnPlayerReputationChange(Player* player, uint32 factionID, int32& standing, bool /*incremental*/) override
{
uint32 repGain = player->GetReputation(factionID);
TeamId teamId = player->GetTeamId(true);
Expand Down
Loading