Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battlegrounds: Strand of the Ancients Rework

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3d56cdc08413a0682299136a763e13e67d38818b)
This commit is contained in:
hondacrx
2024-03-06 17:19:02 -05:00
parent faab7ba1f1
commit 69d144c399
27 changed files with 876 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleGrounds/BattleGroundManager.cs
+6 -5
View File
@@ -8,6 +8,7 @@ using Game.BattleGrounds.Zones.AlteracValley;
using Game.BattleGrounds.Zones.ArathisBasin;
using Game.BattleGrounds.Zones.EyeofStorm;
using Game.BattleGrounds.Zones.WarsongGluch;
using Game.BattleGrounds.Zones.StrandOfAncients;
using Game.DataStorage;
using Game.Entities;
using Game.Networking.Packets;
@@ -147,7 +148,7 @@ namespace Game.BattleGrounds
battlefieldStatus = new BattlefieldStatusActive();
BuildBattlegroundStatusHeader(battlefieldStatus.Hdr, player, ticketId, joinTime, queueId);
battlefieldStatus.ShutdownTimer = bg.GetRemainingTime();
battlefieldStatus.ArenaFaction = (byte)(player.GetBGTeam() == Team.Horde ? BatttleGroundTeamId.Horde : BatttleGroundTeamId.Alliance);
battlefieldStatus.ArenaFaction = (byte)(player.GetBGTeam() == Team.Horde ? BattleGroundTeamId.Horde : BattleGroundTeamId.Alliance);
battlefieldStatus.LeftEarly = false;
battlefieldStatus.StartTimer = bg.GetElapsedTime();
battlefieldStatus.Mapid = bg.GetMapId();
@@ -353,8 +354,8 @@ namespace Game.BattleGrounds
uint startId = result.Read<uint>(1);
WorldSafeLocsEntry start = Global.ObjectMgr.GetWorldSafeLoc(startId);
if (start != null)
bgTemplate.StartLocation[BatttleGroundTeamId.Alliance] = start;
else if (bgTemplate.StartLocation[BatttleGroundTeamId.Alliance] != null) // reload case
bgTemplate.StartLocation[BattleGroundTeamId.Alliance] = start;
else if (bgTemplate.StartLocation[BattleGroundTeamId.Alliance] != null) // reload case
Log.outError(LogFilter.Sql, $"Table `battleground_template` for id {bgTemplate.Id} contains a non-existing WorldSafeLocs.dbc id {startId} in field `AllianceStartLoc`. Ignoring.");
else
{
@@ -365,8 +366,8 @@ namespace Game.BattleGrounds
startId = result.Read<uint>(2);
start = Global.ObjectMgr.GetWorldSafeLoc(startId);
if (start != null)
bgTemplate.StartLocation[BatttleGroundTeamId.Horde] = start;
else if (bgTemplate.StartLocation[BatttleGroundTeamId.Horde] != null) // reload case
bgTemplate.StartLocation[BattleGroundTeamId.Horde] = start;
else if (bgTemplate.StartLocation[BattleGroundTeamId.Horde] != null) // reload case
Log.outError(LogFilter.Sql, $"Table `battleground_template` for id {bgTemplate.Id} contains a non-existing WorldSafeLocs.dbc id {startId} in field `HordeStartLoc`. Ignoring.");
else
{