From e7cf13a4a8fc83477c894157a9f2d5dbc6a881d0 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sun, 24 May 2026 20:01:11 -0300 Subject: [PATCH] fix(Core/Battlefield): Restrict WG relic-room kick to wartime (#25960) Co-authored-by: Claude Opus 4.7 (1M context) --- src/server/game/Battlefield/Zones/BattlefieldWG.cpp | 4 ++-- src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index b6fb573926..49533cafa1 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -911,8 +911,8 @@ void BattlefieldWG::OnPlayerEnterZone(Player* player) // Send worldstate to player SendInitWorldStatesTo(player); - // xinef: Attacker, if hidden in relic room kick him out - if (player->GetTeamId() == GetAttackerTeam()) + // xinef: Attacker, if hidden in relic room kick him out (only during wartime) + if (IsWarTime() && player->GetTeamId() == GetAttackerTeam()) if (player->GetPositionX() > 5400.0f && player->GetPositionX() < 5490.0f && player->GetPositionY() > 2803.0f && player->GetPositionY() < 2878.0f) KickPlayerFromBattlefield(player->GetGUID()); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 21468993b2..0941c82aa7 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -1586,7 +1586,7 @@ uint8 BattlegroundAV::GetAttackString(BG_AV_Nodes node, TeamId teamId) if (teamId == TEAM_ALLIANCE) strId = AV_TEXT_A_HERALD_ICEBLOOD_TOWER_ATTACK; else - strId = AV_TEXT_H_HERALD_ICEBLOOD_TOWER_ATTACK; + strId = AV_TEXT_H_HERALD_ICEBLOOD_TOWER_ATTACK; break; case BG_AV_NODES_ICEBLOOD_GRAVE: if (teamId == TEAM_ALLIANCE)