From c64c0a29455d60015b13e9f7d56560da95d86b7c Mon Sep 17 00:00:00 2001 From: acidmanifesto Date: Fri, 18 Feb 2022 09:37:23 -0500 Subject: [PATCH] fix (core): BG Final Override to Final (#10729) * fix (core): BG Final Override to Final --- src/server/game/Battlegrounds/ArenaScore.h | 4 ++-- src/server/game/Battlegrounds/Zones/BattlegroundAB.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundAV.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundEY.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundIC.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundSA.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundWS.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/game/Battlegrounds/ArenaScore.h b/src/server/game/Battlegrounds/ArenaScore.h index 3bb8b113a..0528d4830 100644 --- a/src/server/game/Battlegrounds/ArenaScore.h +++ b/src/server/game/Battlegrounds/ArenaScore.h @@ -29,8 +29,8 @@ protected: ArenaScore(ObjectGuid playerGuid, TeamId team) : BattlegroundScore(playerGuid), PvPTeamId(team == TEAM_ALLIANCE ? PVP_TEAM_ALLIANCE : PVP_TEAM_HORDE) { } - void AppendToPacket(WorldPacket& data) final override; - void BuildObjectivesBlock(WorldPacket& data) final override; + void AppendToPacket(WorldPacket& data) final; + void BuildObjectivesBlock(WorldPacket& data) final; // For Logging purpose std::string ToString() const override diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h index d585a7591..0ac0e1d2b 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h @@ -278,7 +278,7 @@ protected: } } - void BuildObjectivesBlock(WorldPacket& data) final override; + void BuildObjectivesBlock(WorldPacket& data) final; uint32 GetAttr1() const final override { return BasesAssaulted; } uint32 GetAttr2() const final override { return BasesDefended; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index cd738ae5d..1d9e701e4 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1595,7 +1595,7 @@ protected: } } - void BuildObjectivesBlock(WorldPacket& data) final override; + void BuildObjectivesBlock(WorldPacket& data) final; uint32 GraveyardsAssaulted = 0; uint32 GraveyardsDefended = 0; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index c55a1cfc4..fee94125a 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -369,7 +369,7 @@ protected: } } - void BuildObjectivesBlock(WorldPacket& data) final override; + void BuildObjectivesBlock(WorldPacket& data) final; uint32 GetAttr1() const final override { return FlagCaptures; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index 5d1a183db..728f4d0d3 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -939,7 +939,7 @@ protected: } } - void BuildObjectivesBlock(WorldPacket& data) final override; + void BuildObjectivesBlock(WorldPacket& data) final; uint32 GetAttr1() const final override { return BasesAssaulted; } uint32 GetAttr2() const final override { return BasesDefended; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 8f3d86db8..caf778916 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -442,7 +442,7 @@ protected: } } - void BuildObjectivesBlock(WorldPacket& data) final override; + void BuildObjectivesBlock(WorldPacket& data) final; uint32 GetAttr1() const final override { return DemolishersDestroyed; } uint32 GetAttr2() const final override { return GatesDestroyed; } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h index cfedd1894..c65b881d7 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h @@ -205,7 +205,7 @@ protected: } } - void BuildObjectivesBlock(WorldPacket& data) final override; + void BuildObjectivesBlock(WorldPacket& data) final; uint32 GetAttr1() const final override { return FlagCaptures; } uint32 GetAttr2() const final override { return FlagReturns; }