tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't send chat to ghosts on other maps (#4698)

Browse Source
This commit is contained in:
metalgearsloth
2021-09-29 19:02:27 +10:00
committed by GitHub
parent ff1467a860
commit fe4a415d3b
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -40,6 +40,7 @@ namespace Content.Server.Chat.Managers
{ "revolutionary", "#aa00ff" } { "revolutionary", "#aa00ff" }
}; };
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IServerNetManager _netManager = default!; [Dependency] private readonly IServerNetManager _netManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IMoMMILink _mommiLink = default!; [Dependency] private readonly IMoMMILink _mommiLink = default!;
@@ -133,12 +134,24 @@ namespace Content.Server.Chat.Managers
message = message.Trim(); message = message.Trim();
var mapPos = source.Transform.MapPosition; // We'll try to avoid using MapPosition as EntityCoordinates can early-out and potentially be faster for common use cases
// Downside is it may potentially convert to MapPosition unnecessarily.
var sourceMapId = source.Transform.MapID;
var sourceCoords = source.Transform.Coordinates;
var clients = _playerManager.GetPlayersBy((x) => x.AttachedEntity != null var clients = new List<INetChannel>();
&& (x.AttachedEntity.HasComponent<GhostComponent>()
|| mapPos.InRange(x.AttachedEntity.Transform.MapPosition, VoiceRange))) foreach (var player in _playerManager.GetAllPlayers())
.Select(p => p.ConnectedClient).ToList(); {
if (player.AttachedEntity == null) continue;
var transform = player.AttachedEntity.Transform;
if (transform.MapID != sourceMapId ||
!player.AttachedEntity.HasComponent<GhostComponent>() &&
!sourceCoords.InRange(_entManager, transform.Coordinates, VoiceRange)) continue;
clients.Add(player.ConnectedClient);
}
if (message.StartsWith(';')) if (message.StartsWith(';'))
{ {