Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Removed Old PlayerSession Functions (#5404)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2021-11-22 23:11:48 -08:00
committed by GitHub
parent 7910928679
commit 6e54e740c7
26 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ namespace Content.Server.Chat.Managers
var clients = new List<INetChannel>();
foreach (var player in _playerManager.GetAllPlayers())
foreach (var player in _playerManager.Sessions)
{
if (player.AttachedEntity == null) continue;
var transform = player.AttachedEntity.Transform;
@@ -222,15 +222,18 @@ namespace Content.Server.Chat.Managers
action = FormattedMessage.EscapeText(action);
var pos = source.Transform.Coordinates;
var clients = _playerManager.GetPlayersInRange(pos, VoiceRange).Select(p => p.ConnectedClient);
var clients = Filter.Empty()
.AddInRange(source.Transform.MapPosition, VoiceRange)
.Recipients
.Select(p => p.ConnectedClient)
.ToList();
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Emotes;
msg.Message = action;
msg.MessageWrap = Loc.GetString("chat-manager-entity-me-wrap-message", ("entityName",source.Name));
msg.SenderEntity = source.Uid;
_netManager.ServerSendToMany(msg, clients.ToList());
_netManager.ServerSendToMany(msg, clients);
}
public void SendOOC(IPlayerSession player, string message)
@@ -324,10 +327,11 @@ namespace Content.Server.Chat.Managers
private IEnumerable<INetChannel> GetDeadChatClients()
{
return _playerManager
.GetPlayersBy(x => x.AttachedEntity != null && x.AttachedEntity.HasComponent<GhostComponent>())
.Select(p => p.ConnectedClient)
.Union(_adminManager.ActiveAdmins.Select(p => p.ConnectedClient));
return Filter.Empty()
.AddWhereAttachedEntity(uid => _entManager.HasComponent<GhostComponent>(uid))
.Recipients
.Union(_adminManager.ActiveAdmins)
.Select(p => p.ConnectedClient);
}
public void SendAdminChat(IPlayerSession player, string message)