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

Core/Battlegrounds: Replaced overriding m_team with more fine grained approach

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/55587694053583b4cb85be38a47563a9fdf77271)
This commit is contained in:
hondacrx
2022-05-31 13:45:46 -04:00
parent 014c4b9c54
commit dfee7691f7
22 changed files with 109 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Text/CreatureTextManager.cs
+6 -6
View File
@@ -327,7 +327,7 @@ namespace Game
uint areaId = source.GetAreaId();
var players = source.GetMap().GetPlayers();
foreach (var pl in players)
if (pl.GetAreaId() == areaId && (team == 0 || pl.GetTeam() == team) && (!gmOnly || pl.IsGameMaster()))
if (pl.GetAreaId() == areaId && (team == 0 || pl.GetEffectiveTeam() == team) && (!gmOnly || pl.IsGameMaster()))
pl.SendPacket(data);
return;
}
@@ -336,7 +336,7 @@ namespace Game
uint zoneId = source.GetZoneId();
var players = source.GetMap().GetPlayers();
foreach (var pl in players)
if (pl.GetZoneId() == zoneId && (team == 0 || pl.GetTeam() == team) && (!gmOnly || pl.IsGameMaster()))
if (pl.GetZoneId() == zoneId && (team == 0 || pl.GetEffectiveTeam() == team) && (!gmOnly || pl.IsGameMaster()))
pl.SendPacket(data);
return;
}
@@ -344,7 +344,7 @@ namespace Game
{
var players = source.GetMap().GetPlayers();
foreach (var pl in players)
if ((team == 0 || pl.GetTeam() == team) && (!gmOnly || pl.IsGameMaster()))
if ((team == 0 || pl.GetEffectiveTeam() == team) && (!gmOnly || pl.IsGameMaster()))
pl.SendPacket(data);
return;
}
@@ -479,7 +479,7 @@ namespace Game
uint areaId = source.GetAreaId();
var players = source.GetMap().GetPlayers();
foreach (var pl in players)
if (pl.GetAreaId() == areaId && (team == 0 || pl.GetTeam() == team) && (!gmOnly || pl.IsGameMaster()))
if (pl.GetAreaId() == areaId && (team == 0 || pl.GetEffectiveTeam() == team) && (!gmOnly || pl.IsGameMaster()))
localizer.Invoke(pl);
return;
}
@@ -488,7 +488,7 @@ namespace Game
uint zoneId = source.GetZoneId();
var players = source.GetMap().GetPlayers();
foreach (var pl in players)
if (pl.GetZoneId() == zoneId && (team == 0 || pl.GetTeam() == team) && (!gmOnly || pl.IsGameMaster()))
if (pl.GetZoneId() == zoneId && (team == 0 || pl.GetEffectiveTeam() == team) && (!gmOnly || pl.IsGameMaster()))
localizer.Invoke(pl);
return;
}
@@ -496,7 +496,7 @@ namespace Game
{
var players = source.GetMap().GetPlayers();
foreach (var pl in players)
if ((team == 0 || pl.GetTeam() == team) && (!gmOnly || pl.IsGameMaster()))
if ((team == 0 || pl.GetEffectiveTeam() == team) && (!gmOnly || pl.IsGameMaster()))
localizer.Invoke(pl);
return;
}