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

Core/Battlegrounds: Clean up some Team/TeamId parameters to use enums instead of raw integer types

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/1ef0c045202a6af33fb991f2ff765fa183ce976f)
This commit is contained in:
hondacrx
2024-02-04 16:31:49 -05:00
parent 00de526f7d
commit 5972f3b8a1
32 changed files with 360 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/OutdoorPVP/OutdoorPvP.cs
+2 -2
View File
@@ -160,7 +160,7 @@ namespace Game.PvP
public void TeamApplyBuff(uint teamIndex, uint spellId, uint spellId2)
{
TeamCastSpell(teamIndex, (int)spellId);
TeamCastSpell((uint)(teamIndex == TeamId.Alliance ? TeamId.Horde : TeamId.Alliance), spellId2 != 0 ? -(int)spellId2 : -(int)spellId);
TeamCastSpell((uint)(teamIndex == BatttleGroundTeamId.Alliance ? BatttleGroundTeamId.Horde : BatttleGroundTeamId.Alliance), spellId2 != 0 ? -(int)spellId2 : -(int)spellId);
}
public void SendDefenseMessage(uint zoneId, uint id)
@@ -254,7 +254,7 @@ namespace Game.PvP
public OPvPCapturePoint(OutdoorPvP pvp)
{
m_team = TeamId.Neutral;
m_team = BatttleGroundTeamId.Neutral;
OldState = ObjectiveStates.Neutral;
State = ObjectiveStates.Neutral;
PvP = pvp;
Source/Game/OutdoorPVP/Zones/HellfirePeninsulaPvP.cs
+4 -4
View File
@@ -121,13 +121,13 @@ namespace Game.PvP.HellfirePeninsula
base.Update(diff);
if (m_AllianceTowersControlled == 3)
TeamApplyBuff(TeamId.Alliance, SpellIds.AllianceBuff, SpellIds.HordeBuff);
TeamApplyBuff(BatttleGroundTeamId.Alliance, SpellIds.AllianceBuff, SpellIds.HordeBuff);
else if (m_HordeTowersControlled == 3)
TeamApplyBuff(TeamId.Horde, SpellIds.HordeBuff, SpellIds.AllianceBuff);
TeamApplyBuff(BatttleGroundTeamId.Horde, SpellIds.HordeBuff, SpellIds.AllianceBuff);
else
{
TeamCastSpell(TeamId.Alliance, -(int)SpellIds.AllianceBuff);
TeamCastSpell(TeamId.Horde, -(int)SpellIds.HordeBuff);
TeamCastSpell(BatttleGroundTeamId.Alliance, -(int)SpellIds.AllianceBuff);
TeamCastSpell(BatttleGroundTeamId.Horde, -(int)SpellIds.HordeBuff);
}
SetWorldState(WorldStateIds.CountA, (int)m_AllianceTowersControlled);