nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-07 21:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Battlegrounds): Strand of the Ancients even ship spawns (#24427)

Browse Source 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: sudlud <sudlud@users.noreply.github.com>
This commit is contained in:
sogladev
2026-01-18 19:50:24 +01:00
committed by GitHub
parent 182c9e4ad3
commit d177c900c7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
View File

@@ -52,6 +52,7 @@ BattlegroundSA::BattlegroundSA()
EndRoundTimer = 0s; EndRoundTimer = 0s;
ShipsStarted = false; ShipsStarted = false;
Status = BG_SA_NOTSTARTED; Status = BG_SA_NOTSTARTED;
_nextShipIsEast = true;
for (uint8 i = 0; i < 6; i++) for (uint8 i = 0; i < 6; i++)
GateStatus[i] = BG_SA_GATE_OK; GateStatus[i] = BG_SA_GATE_OK;
@@ -85,6 +86,7 @@ void BattlegroundSA::Init()
_notEvenAScratch[TEAM_HORDE] = true; _notEvenAScratch[TEAM_HORDE] = true;
Status = BG_SA_WARMUP; Status = BG_SA_WARMUP;
_relicClicked = false; _relicClicked = false;
_nextShipIsEast = true;
} }
bool BattlegroundSA::SetupBattleground() bool BattlegroundSA::SetupBattleground()
@@ -181,6 +183,7 @@ bool BattlegroundSA::ResetObjs()
TotalTime = 0s; TotalTime = 0s;
ShipsStarted = false; ShipsStarted = false;
_nextShipIsEast = true;
//Graveyards! //Graveyards!
for (uint8 i = 0; i < BG_SA_MAX_GY; i++) for (uint8 i = 0; i < BG_SA_MAX_GY; i++)
@@ -574,10 +577,12 @@ void BattlegroundSA::TeleportToEntrancePosition(Player* player)
if (!ShipsStarted) if (!ShipsStarted)
{ {
player->CastSpell(player, 12438, true);//Without this player falls before boat loads... player->CastSpell(player, 12438, true);//Without this player falls before boat loads...
if (urand(0, 1)) if (_nextShipIsEast)
player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 2682.936f, -830.368f, 15.0f, 2.895f, 0); player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 2682.936f, -830.368f, 15.0f, 2.895f, 0);
else else
player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 2577.003f, 980.261f, 15.0f, 0.807f, 0); player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 2577.003f, 980.261f, 15.0f, 0.807f, 0);
_nextShipIsEast = !_nextShipIsEast;
} }
else else
player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 1600.381f, -106.263f, 8.8745f, 3.78f, 0); player->TeleportTo(MAP_STRAND_OF_THE_ANCIENTS, 1600.381f, -106.263f, 8.8745f, 3.78f, 0);

2
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
View File

@@ -620,5 +620,7 @@ private:
// Achievement: Not Even a Scratch // Achievement: Not Even a Scratch
bool _notEvenAScratch[PVP_TEAMS_COUNT]; bool _notEvenAScratch[PVP_TEAMS_COUNT];
/// Toggle for alternating player spawns between East and West ships (true = first/East ship, false = second/West ship)
bool _nextShipIsEast;
}; };
#endif #endif