diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 0895183215..4eaa08fe9d 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -267,7 +267,7 @@ namespace Content.Server.Administration.Managers msg.AvailableCommands = commands.ToArray(); - _netMgr.ServerSendMessage(msg, session.ConnectedClient); + _netMgr.ServerSendMessage(msg, session.Channel); } private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e) @@ -389,7 +389,7 @@ namespace Content.Server.Administration.Managers private static bool IsLocal(ICommonSession player) { - var ep = player.ConnectedClient.RemoteEndPoint; + var ep = player.Channel.RemoteEndPoint; var addr = ep.Address; if (addr.IsIPv4MappedToIPv6) { diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs index 4d51d35576..3a05b934b2 100644 --- a/Content.Server/Administration/Managers/BanManager.cs +++ b/Content.Server/Administration/Managers/BanManager.cs @@ -52,7 +52,7 @@ public sealed class BanManager : IBanManager, IPostInjectInit if (e.NewStatus != SessionStatus.Connected || _cachedRoleBans.ContainsKey(e.Session.UserId)) return; - var netChannel = e.Session.ConnectedClient; + var netChannel = e.Session.Channel; ImmutableArray? hwId = netChannel.UserData.HWId.Length == 0 ? null : netChannel.UserData.HWId; await CacheDbRoleBans(e.Session.UserId, netChannel.RemoteEndPoint.Address, hwId); @@ -175,7 +175,7 @@ public sealed class BanManager : IBanManager, IPostInjectInit return; // If they are, kick them var message = banDef.FormatBanMessage(_cfg, _localizationManager); - targetPlayer.ConnectedClient.Disconnect(message); + targetPlayer.Channel.Disconnect(message); } #endregion @@ -293,7 +293,7 @@ public sealed class BanManager : IBanManager, IPostInjectInit }; _sawmill.Debug($"Sent rolebans to {pSession.Name}"); - _netManager.ServerSendMessage(bans, pSession.ConnectedClient); + _netManager.ServerSendMessage(bans, pSession.Channel); } public void PostInject() diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs index 891d395625..e2f48c9f7f 100644 --- a/Content.Server/Administration/PlayerLocator.cs +++ b/Content.Server/Administration/PlayerLocator.cs @@ -1,4 +1,4 @@ -using System.Collections.Immutable; +using System.Collections.Immutable; using System.Net; using System.Net.Http; using System.Net.Http.Headers; @@ -67,8 +67,8 @@ namespace Content.Server.Administration if (_playerManager.TryGetSessionByUsername(playerName, out var session)) { var userId = session.UserId; - var address = session.ConnectedClient.RemoteEndPoint.Address; - var hwId = session.ConnectedClient.UserData.HWId; + var address = session.Channel.RemoteEndPoint.Address; + var hwId = session.Channel.UserData.HWId; return new LocatedPlayerData(userId, address, hwId, session.Name); } @@ -107,8 +107,8 @@ namespace Content.Server.Administration // Check people currently on the server, the easiest case. if (_playerManager.TryGetSessionById(userId, out var session)) { - var address = session.ConnectedClient.RemoteEndPoint.Address; - var hwId = session.ConnectedClient.UserData.HWId; + var address = session.Channel.RemoteEndPoint.Address; + var hwId = session.Channel.UserData.HWId; return new LocatedPlayerData(userId, address, hwId, session.Name); } diff --git a/Content.Server/Administration/QuickDialogSystem.OpenDialog.cs b/Content.Server/Administration/QuickDialogSystem.OpenDialog.cs index fb013a88ad..1bbc8a6c9e 100644 --- a/Content.Server/Administration/QuickDialogSystem.OpenDialog.cs +++ b/Content.Server/Administration/QuickDialogSystem.OpenDialog.cs @@ -1,4 +1,4 @@ -using Content.Shared.Administration; +using Content.Shared.Administration; using JetBrains.Annotations; using Robust.Shared.Player; @@ -33,7 +33,7 @@ public sealed partial class QuickDialogSystem okAction.Invoke(v1); else { - session.ConnectedClient.Disconnect("Replied with invalid quick dialog data."); + session.Channel.Disconnect("Replied with invalid quick dialog data."); cancelAction?.Invoke(); } }), @@ -74,7 +74,7 @@ public sealed partial class QuickDialogSystem okAction.Invoke(v1, v2); else { - session.ConnectedClient.Disconnect("Replied with invalid quick dialog data."); + session.Channel.Disconnect("Replied with invalid quick dialog data."); cancelAction?.Invoke(); } }), @@ -118,7 +118,7 @@ public sealed partial class QuickDialogSystem okAction.Invoke(v1, v2, v3); else { - session.ConnectedClient.Disconnect("Replied with invalid quick dialog data."); + session.Channel.Disconnect("Replied with invalid quick dialog data."); cancelAction?.Invoke(); } }), @@ -166,7 +166,7 @@ public sealed partial class QuickDialogSystem okAction.Invoke(v1, v2, v3, v4); else { - session.ConnectedClient.Disconnect("Replied with invalid quick dialog data."); + session.Channel.Disconnect("Replied with invalid quick dialog data."); cancelAction?.Invoke(); } }), diff --git a/Content.Server/Administration/QuickDialogSystem.cs b/Content.Server/Administration/QuickDialogSystem.cs index 96423e5223..df2953f98d 100644 --- a/Content.Server/Administration/QuickDialogSystem.cs +++ b/Content.Server/Administration/QuickDialogSystem.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Shared.Administration; using Robust.Server.Player; using Robust.Shared.Enums; @@ -40,7 +40,7 @@ public sealed partial class QuickDialogSystem : EntitySystem { if (!_openDialogs.ContainsKey(msg.DialogId) || !_openDialogsByUser[args.SenderSession.UserId].Contains(msg.DialogId)) { - args.SenderSession.ConnectedClient.Disconnect($"Replied with invalid quick dialog data with id {msg.DialogId}."); + args.SenderSession.Channel.Disconnect($"Replied with invalid quick dialog data with id {msg.DialogId}."); return; } diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index 966bff2f71..abaa99ece5 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -106,7 +106,7 @@ namespace Content.Server.Administration.Systems foreach (var admin in _adminManager.ActiveAdmins) { - RaiseNetworkEvent(updateEv, admin.ConnectedClient); + RaiseNetworkEvent(updateEv, admin.Channel); } } @@ -121,7 +121,7 @@ namespace Content.Server.Administration.Systems foreach (var admin in _adminManager.ActiveAdmins) { - RaiseNetworkEvent(playerInfoChangedEvent, admin.ConnectedClient); + RaiseNetworkEvent(playerInfoChangedEvent, admin.Channel); } } @@ -157,7 +157,7 @@ namespace Content.Server.Administration.Systems if (!obj.IsAdmin) { - RaiseNetworkEvent(new FullPlayerListEvent(), obj.Player.ConnectedClient); + RaiseNetworkEvent(new FullPlayerListEvent(), obj.Player.Channel); return; } @@ -210,7 +210,7 @@ namespace Content.Server.Administration.Systems ev.PlayersInfo = _playerList.Values.ToList(); - RaiseNetworkEvent(ev, playerSession.ConnectedClient); + RaiseNetworkEvent(ev, playerSession.Channel); } private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession? session) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index c0f660d216..8a819f5942 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -500,7 +500,7 @@ public sealed partial class AdminVerbSystem Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/gavel.svg.192dpi.png")), Act = () => { - _ghostKickManager.DoDisconnect(actorComponent.PlayerSession.ConnectedClient, "Smitten."); + _ghostKickManager.DoDisconnect(actorComponent.PlayerSession.Channel, "Smitten."); }, Impact = LogImpact.Extreme, Message = Loc.GetString("admin-smite-ghostkick-description") diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs index a0f5b95ae2..87c200e08b 100644 --- a/Content.Server/Administration/Systems/BwoinkSystem.cs +++ b/Content.Server/Administration/Systems/BwoinkSystem.cs @@ -431,7 +431,7 @@ namespace Content.Server.Administration.Systems // Notify player if (_playerManager.TryGetSessionById(message.UserId, out var session)) { - if (!admins.Contains(session.ConnectedClient)) + if (!admins.Contains(session.Channel)) { // If _overrideClientName is set, we generate a new message with the override name. The admins name will still be the original name for the webhooks. if (_overrideClientName != string.Empty) @@ -451,10 +451,10 @@ namespace Content.Server.Administration.Systems overrideMsgText = $"{senderSession.Name}: {escapedText}"; // Not an admin, name is not overridden. } - RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, senderSession.UserId, overrideMsgText), session.ConnectedClient); + RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, senderSession.UserId, overrideMsgText), session.Channel); } else - RaiseNetworkEvent(msg, session.ConnectedClient); + RaiseNetworkEvent(msg, session.Channel); } } @@ -480,7 +480,7 @@ namespace Content.Server.Administration.Systems // No admin online, let the player know var systemText = Loc.GetString("bwoink-system-starmute-message-no-other-users"); var starMuteMsg = new BwoinkTextMessage(message.UserId, SystemUserId, systemText); - RaiseNetworkEvent(starMuteMsg, senderSession.ConnectedClient); + RaiseNetworkEvent(starMuteMsg, senderSession.Channel); } // Returns all online admins with AHelp access @@ -488,7 +488,7 @@ namespace Content.Server.Administration.Systems { return _adminManager.ActiveAdmins .Where(p => _adminManager.GetAdminData(p)?.HasFlag(AdminFlags.Adminhelp) ?? false) - .Select(p => p.ConnectedClient) + .Select(p => p.Channel) .ToList(); } diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index a5a7cd89d8..51f260f32a 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -145,7 +145,7 @@ public sealed class AntagSelectionSystem : GameRuleSystem { var message = Loc.GetString(antagGreeting); var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message)); - _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Server, message, wrappedMessage, default, false, mind.Session.ConnectedClient, Color.FromHex(greetingColor)); + _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Server, message, wrappedMessage, default, false, mind.Session.Channel, Color.FromHex(greetingColor)); } } } diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index b28fd88186..6d54bedf86 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -119,7 +119,7 @@ namespace Content.Server.Chat.Managers public void DispatchServerMessage(ICommonSession player, string message, bool suppressLog = false) { var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message))); - ChatMessageToOne(ChatChannel.Server, message, wrappedMessage, default, false, player.ConnectedClient); + ChatMessageToOne(ChatChannel.Server, message, wrappedMessage, default, false, player.Channel); if (!suppressLog) _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server message to {player:Player}: {message}"); @@ -127,7 +127,7 @@ namespace Content.Server.Chat.Managers public void SendAdminAnnouncement(string message) { - var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient); + var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); var wrappedMessage = Loc.GetString("chat-manager-send-admin-announcement-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("message", FormattedMessage.EscapeText(message))); @@ -138,7 +138,7 @@ namespace Content.Server.Chat.Managers public void SendAdminAlert(string message) { - var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient); + var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); var wrappedMessage = Loc.GetString("chat-manager-send-admin-announcement-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("message", FormattedMessage.EscapeText(message))); @@ -230,7 +230,7 @@ namespace Content.Server.Chat.Managers var prefs = _preferencesManager.GetPreferences(player.UserId); colorOverride = prefs.AdminOOCColor; } - if (player.ConnectedClient.UserData.PatronTier is { } patron && + if (player.Channel.UserData.PatronTier is { } patron && PatronOocColors.TryGetValue(patron, out var patronColor)) { wrappedMessage = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor),("playerName", player.Name), ("message", FormattedMessage.EscapeText(message))); @@ -250,14 +250,14 @@ namespace Content.Server.Chat.Managers return; } - var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient); + var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message))); foreach (var client in clients) { - var isSource = client != player.ConnectedClient; + var isSource = client != player.Channel; ChatMessageToOne(ChatChannel.AdminChat, message, wrappedMessage, @@ -326,7 +326,7 @@ namespace Content.Server.Chat.Managers var clients = new List(); foreach (var recipient in filter.Recipients) { - clients.Add(recipient.ConnectedClient); + clients.Add(recipient.Channel); } ChatMessageToMany(channel, message, wrappedMessage, source, hideChat, recordReplay, clients, colorOverride, audioPath, audioVolume); diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 194844997b..81656d29d7 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -496,14 +496,14 @@ public sealed partial class ChatSystem : SharedChatSystem continue; // Won't get logged to chat, and ghosts are too far away to see the pop-up, so we just won't send it to them. if (data.Range <= WhisperClearRange) - _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.ConnectedClient); + _chatManager.ChatMessageToOne(ChatChannel.Whisper, message, wrappedMessage, source, false, session.Channel); //If listener is too far, they only hear fragments of the message //Collisiongroup.Opaque is not ideal for this use. Preferably, there should be a check specifically with "Can Ent1 see Ent2" in mind else if (_interactionSystem.InRangeUnobstructed(source, listener, WhisperMuffledRange, Shared.Physics.CollisionGroup.Opaque)) //Shared.Physics.CollisionGroup.Opaque - _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedobfuscatedMessage, source, false, session.ConnectedClient); + _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedobfuscatedMessage, source, false, session.Channel); //If listener is too far and has no line of sight, they can't identify the whisperer's identity else - _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedUnknownMessage, source, false, session.ConnectedClient); + _chatManager.ChatMessageToOne(ChatChannel.Whisper, obfuscatedMessage, wrappedUnknownMessage, source, false, session.Channel); } _replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range))); @@ -595,7 +595,7 @@ public sealed partial class ChatSystem : SharedChatSystem { wrappedMessage = Loc.GetString("chat-manager-send-admin-dead-chat-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), - ("userName", player.ConnectedClient.UserName), + ("userName", player.Channel.UserName), ("message", FormattedMessage.EscapeText(message))); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Admin dead chat from {player:Player}: {message}"); } @@ -671,7 +671,7 @@ public sealed partial class ChatSystem : SharedChatSystem if (entRange == MessageRangeCheckResult.Disallowed) continue; var entHideChat = entRange == MessageRangeCheckResult.HideChat; - _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.ConnectedClient, author: author); + _chatManager.ChatMessageToOne(channel, message, wrappedMessage, source, entHideChat, session.Channel, author: author); } _replay.RecordServerMessage(new ChatMessage(channel, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range))); @@ -754,7 +754,7 @@ public sealed partial class ChatSystem : SharedChatSystem .AddWhereAttachedEntity(HasComp) .Recipients .Union(_adminManager.ActiveAdmins) - .Select(p => p.ConnectedClient); + .Select(p => p.Channel); } private string SanitizeMessagePeriod(string message) diff --git a/Content.Server/Construction/ConstructionSystem.Guided.cs b/Content.Server/Construction/ConstructionSystem.Guided.cs index 84028b6b7f..fe7f9152c0 100644 --- a/Content.Server/Construction/ConstructionSystem.Guided.cs +++ b/Content.Server/Construction/ConstructionSystem.Guided.cs @@ -29,7 +29,7 @@ namespace Content.Server.Construction return; if(GetGuide(prototype) is {} guide) - RaiseNetworkEvent(new ResponseConstructionGuide(msg.ConstructionId, guide), args.SenderSession.ConnectedClient); + RaiseNetworkEvent(new ResponseConstructionGuide(msg.ConstructionId, guide), args.SenderSession.Channel); } private void AddDeconstructVerb(EntityUid uid, ConstructionComponent component, GetVerbsEvent args) diff --git a/Content.Server/EUI/BaseEui.cs b/Content.Server/EUI/BaseEui.cs index 70cbfc3775..3459fafe41 100644 --- a/Content.Server/EUI/BaseEui.cs +++ b/Content.Server/EUI/BaseEui.cs @@ -1,4 +1,4 @@ -using Content.Shared.Eui; +using Content.Shared.Eui; using Robust.Shared.Network; using Robust.Shared.Player; @@ -86,7 +86,7 @@ namespace Content.Server.EUI msg.Id = Id; msg.Message = message; - netMgr.ServerSendMessage(msg, Player.ConnectedClient); + netMgr.ServerSendMessage(msg, Player.Channel); } /// @@ -114,7 +114,7 @@ namespace Content.Server.EUI msg.Id = Id; msg.State = state; - netMgr.ServerSendMessage(msg, Player.ConnectedClient); + netMgr.ServerSendMessage(msg, Player.Channel); } internal void Initialize(EuiManager manager, ICommonSession player, uint id) diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs index fe8e486b68..b789c9c8f8 100644 --- a/Content.Server/EUI/EuiManager.cs +++ b/Content.Server/EUI/EuiManager.cs @@ -1,4 +1,4 @@ -using Content.Shared.Eui; +using Content.Shared.Eui; using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.Network; @@ -71,7 +71,7 @@ namespace Content.Server.EUI msg.Type = MsgEuiCtl.CtlType.Open; msg.OpenType = eui.GetType().Name; - _net.ServerSendMessage(msg, player.ConnectedClient); + _net.ServerSendMessage(msg, player.Channel); } public void CloseEui(BaseEui eui) @@ -82,7 +82,7 @@ namespace Content.Server.EUI var msg = new MsgEuiCtl(); msg.Id = eui.Id; msg.Type = MsgEuiCtl.CtlType.Close; - _net.ServerSendMessage(msg, eui.Player.ConnectedClient); + _net.ServerSendMessage(msg, eui.Player.Channel); } private void RxMsgMessage(MsgEuiMessage message) diff --git a/Content.Server/Examine/ExamineSystem.cs b/Content.Server/Examine/ExamineSystem.cs index bb7e07d235..d7546e2eb0 100644 --- a/Content.Server/Examine/ExamineSystem.cs +++ b/Content.Server/Examine/ExamineSystem.cs @@ -40,14 +40,14 @@ namespace Content.Server.Examine GetNetEntity(target), 0, message, verbs?.ToList(), centerAtCursor ); - RaiseNetworkEvent(ev, session.ConnectedClient); + RaiseNetworkEvent(ev, session.Channel); } private void ExamineInfoRequest(ExamineSystemMessages.RequestExamineInfoMessage request, EntitySessionEventArgs eventArgs) { var player = eventArgs.SenderSession; var session = eventArgs.SenderSession; - var channel = player.ConnectedClient; + var channel = player.Channel; var entity = GetEntity(request.NetEntity); if (session.AttachedEntity is not {Valid: true} playerEnt diff --git a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs index c17eea684d..ac967b3c20 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs @@ -39,7 +39,7 @@ public sealed class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOverlaySyst } var message = new PuddleOverlayDisableMessage(); - RaiseNetworkEvent(message, observer.ConnectedClient); + RaiseNetworkEvent(message, observer.Channel); } public override void Update(float frameTime) diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs index cbccda73fc..3a6f742baa 100644 --- a/Content.Server/GameTicking/GameTicker.Lobby.cs +++ b/Content.Server/GameTicking/GameTicker.Lobby.cs @@ -101,7 +101,7 @@ namespace Content.Server.GameTicking { foreach (var player in _playerManager.Sessions) { - RaiseNetworkEvent(GetStatusMsg(player), player.ConnectedClient); + RaiseNetworkEvent(GetStatusMsg(player), player.Channel); } } @@ -156,7 +156,7 @@ namespace Content.Server.GameTicking _playerGameStatuses[playerUserId] = status; if (!_playerManager.TryGetSessionById(playerUserId, out var playerSession)) continue; - RaiseNetworkEvent(GetStatusMsg(playerSession), playerSession.ConnectedClient); + RaiseNetworkEvent(GetStatusMsg(playerSession), playerSession.Channel); } } @@ -175,7 +175,7 @@ namespace Content.Server.GameTicking var status = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay; _playerGameStatuses[player.UserId] = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay; - RaiseNetworkEvent(GetStatusMsg(player), player.ConnectedClient); + RaiseNetworkEvent(GetStatusMsg(player), player.Channel); // update server info to reflect new ready count UpdateInfoText(); } diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index ec1f0e368a..6deda49583 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -168,7 +168,7 @@ namespace Content.Server.GameTicking _playerGameStatuses[session.UserId] = PlayerGameStatus.JoinedGame; _db.AddRoundPlayers(RoundId, session.UserId); - RaiseNetworkEvent(new TickerJoinGameEvent(), session.ConnectedClient); + RaiseNetworkEvent(new TickerJoinGameEvent(), session.Channel); } private void PlayerJoinLobby(ICommonSession session) @@ -176,7 +176,7 @@ namespace Content.Server.GameTicking _playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay; _db.AddRoundPlayers(RoundId, session.UserId); - var client = session.ConnectedClient; + var client = session.Channel; RaiseNetworkEvent(new TickerJoinLobbyEvent(), client); RaiseNetworkEvent(GetStatusMsg(session), client); RaiseNetworkEvent(GetInfoMsg(), client); diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs index 94f4072243..b11c28fb2b 100644 --- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Chat.Managers; +using Content.Server.Chat.Managers; using Content.Server.GameTicking.Rules.Components; using Content.Server.Station.Systems; using Content.Shared.Chat; @@ -136,7 +136,7 @@ public sealed class RespawnRuleSystem : GameRuleSystem var msg = Loc.GetString("rule-respawn-in-seconds", ("second", component.RespawnDelay.TotalSeconds)); var wrappedMsg = Loc.GetString("chat-manager-server-wrap-message", ("message", msg)); - _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMsg, respawnTracker, false, actor.PlayerSession.ConnectedClient, Color.LimeGreen); + _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMsg, respawnTracker, false, actor.PlayerSession.Channel, Color.LimeGreen); component.RespawnQueue[actor.PlayerSession.UserId] = _timing.CurTime + component.RespawnDelay; return true; } diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs index 869bd128fd..5645858543 100644 --- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs @@ -229,7 +229,7 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem // I went all the way to ChatManager.cs and all i got was this lousy T-shirt // You got a free T-shirt!?!? _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Server, message, - wrappedMessage, default, false, zombie.ConnectedClient, Color.Plum); + wrappedMessage, default, false, zombie.Channel, Color.Plum); _audio.PlayGlobal(component.InitialInfectedSound, ownedEntity); } } diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index acdeca9af0..c0e753c4c5 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -264,7 +264,7 @@ namespace Content.Server.Ghost } var response = new GhostWarpsResponseEvent(GetPlayerWarps(entity).Concat(GetLocationWarps()).ToList()); - RaiseNetworkEvent(response, args.SenderSession.ConnectedClient); + RaiseNetworkEvent(response, args.SenderSession.Channel); } private void OnGhostWarpToTargetRequest(GhostWarpToTargetRequestEvent msg, EntitySessionEventArgs args) diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs index f372cb4f62..cd04e3fb37 100644 --- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs @@ -163,7 +163,7 @@ namespace Content.Server.Ghost.Roles var response = new GhostUpdateGhostRoleCountEvent(GetGhostRolesInfo().Length); foreach (var player in _playerManager.Sessions) { - RaiseNetworkEvent(response, player.ConnectedClient); + RaiseNetworkEvent(response, player.Channel); } } } @@ -173,7 +173,7 @@ namespace Content.Server.Ghost.Roles if (args.NewStatus == SessionStatus.InGame) { var response = new GhostUpdateGhostRoleCountEvent(_ghostRoles.Count); - RaiseNetworkEvent(response, args.Session.ConnectedClient); + RaiseNetworkEvent(response, args.Session.Channel); } } diff --git a/Content.Server/GhostKick/GhostKickManager.cs b/Content.Server/GhostKick/GhostKickManager.cs index 4d663caa5a..7dd82970ac 100644 --- a/Content.Server/GhostKick/GhostKickManager.cs +++ b/Content.Server/GhostKick/GhostKickManager.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration; +using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.GhostKick; using Robust.Server.Player; @@ -71,6 +71,6 @@ public sealed class GhostKickCommand : IConsoleCommand return; } - ghostKick.DoDisconnect(player.ConnectedClient, reason); + ghostKick.DoDisconnect(player.Channel, reason); } } diff --git a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs b/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs index 7dc5fc55ab..2a5d9065fa 100644 --- a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs +++ b/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Explosion.EntitySystems; +using Content.Server.Explosion.EntitySystems; using Robust.Shared.Player; namespace Content.Server.GhostKick; @@ -18,7 +18,7 @@ public sealed class GhostKickUserOnTriggerSystem : EntitySystem return; _ghostKickManager.DoDisconnect( - actor.PlayerSession.ConnectedClient, + actor.PlayerSession.Channel, "Tripped over a kick mine, crashed through the fourth wall"); args.Handled = true; diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs index 8fae121bcb..69bce80592 100644 --- a/Content.Server/Info/InfoSystem.cs +++ b/Content.Server/Info/InfoSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.CCVar; +using Content.Shared.CCVar; using Content.Shared.Info; using Robust.Shared.Configuration; using Robust.Shared.ContentPack; @@ -31,6 +31,6 @@ public sealed class InfoSystem : EntitySystem Logger.ErrorS("info", "Could not read server rules file."); } var response = new RulesMessage(title, rules); - RaiseNetworkEvent(response, eventArgs.SenderSession.ConnectedClient); + RaiseNetworkEvent(response, eventArgs.SenderSession.Channel); } } diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs index 286e371b2c..66273e4f63 100644 --- a/Content.Server/Info/ShowRulesCommand.cs +++ b/Content.Server/Info/ShowRulesCommand.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration; +using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.CCVar; using Content.Shared.Info; @@ -61,6 +61,6 @@ public sealed class ShowRulesCommand : IConsoleCommand message.PopupTime = seconds; var player = IoCManager.Resolve().GetSessionByUserId(located.UserId); - netManager.ServerSendMessage(message, player.ConnectedClient); + netManager.ServerSendMessage(message, player.Channel); } } diff --git a/Content.Server/Maps/GridDraggingSystem.cs b/Content.Server/Maps/GridDraggingSystem.cs index 7d7b61955b..76b2e29dea 100644 --- a/Content.Server/Maps/GridDraggingSystem.cs +++ b/Content.Server/Maps/GridDraggingSystem.cs @@ -44,7 +44,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem RaiseNetworkEvent(new GridDragToggleMessage() { Enabled = _draggers.Contains(session), - }, session.ConnectedClient); + }, session.Channel); } private void OnRequestVelocity(GridDragVelocityRequest ev, EntitySessionEventArgs args) diff --git a/Content.Server/Motd/MOTDSystem.cs b/Content.Server/Motd/MOTDSystem.cs index 39d780f108..65c1404065 100644 --- a/Content.Server/Motd/MOTDSystem.cs +++ b/Content.Server/Motd/MOTDSystem.cs @@ -55,7 +55,7 @@ public sealed class MOTDSystem : EntitySystem return; var wrappedMessage = Loc.GetString("motd-wrap-message", ("motd", _messageOfTheDay)); - _chatManager.ChatMessageToOne(ChatChannel.Server, _messageOfTheDay, wrappedMessage, source: EntityUid.Invalid, hideChat: false, client: player.ConnectedClient); + _chatManager.ChatMessageToOne(ChatChannel.Server, _messageOfTheDay, wrappedMessage, source: EntityUid.Invalid, hideChat: false, client: player.Channel); } /// @@ -72,7 +72,7 @@ public sealed class MOTDSystem : EntitySystem var wrappedMessage = Loc.GetString("motd-wrap-message", ("motd", _messageOfTheDay)); shell.WriteLine(wrappedMessage); if (shell.Player is { } player) - _chatManager.ChatMessageToOne(ChatChannel.Server, _messageOfTheDay, wrappedMessage, source: EntityUid.Invalid, hideChat: false, client: player.ConnectedClient); + _chatManager.ChatMessageToOne(ChatChannel.Server, _messageOfTheDay, wrappedMessage, source: EntityUid.Invalid, hideChat: false, client: player.Channel); } #region Event Handlers diff --git a/Content.Server/Motd/SetMOTDCommand.cs b/Content.Server/Motd/SetMOTDCommand.cs index 9678781c87..c99f728435 100644 --- a/Content.Server/Motd/SetMOTDCommand.cs +++ b/Content.Server/Motd/SetMOTDCommand.cs @@ -36,12 +36,12 @@ public sealed class SetMotdCommand : LocalizedCommands if (string.IsNullOrEmpty(motd)) { shell.WriteLine(Loc.GetString("cmd-set-motd-cleared-motd-message")); - _adminLogManager.Add(LogType.Chat, LogImpact.Low, $"{(player == null ? "LOCALHOST" : player.ConnectedClient.UserName):Player} cleared the MOTD for the server."); + _adminLogManager.Add(LogType.Chat, LogImpact.Low, $"{(player == null ? "LOCALHOST" : player.Channel.UserName):Player} cleared the MOTD for the server."); } else { shell.WriteLine(Loc.GetString("cmd-set-motd-set-motd-message", ("motd", motd))); - _adminLogManager.Add(LogType.Chat, LogImpact.Low, $"{(player == null ? "LOCALHOST" : player.ConnectedClient.UserName):Player} set the MOTD for the server to \"{motd:motd}\""); + _adminLogManager.Add(LogType.Chat, LogImpact.Low, $"{(player == null ? "LOCALHOST" : player.Channel.UserName):Player} set the MOTD for the server to \"{motd:motd}\""); } } diff --git a/Content.Server/NPC/HTN/HTNSystem.cs b/Content.Server/NPC/HTN/HTNSystem.cs index 2ba91d5be6..cfa670e144 100644 --- a/Content.Server/NPC/HTN/HTNSystem.cs +++ b/Content.Server/NPC/HTN/HTNSystem.cs @@ -223,7 +223,7 @@ public sealed class HTNSystem : EntitySystem { Uid = GetNetEntity(uid), Text = text.ToString(), - }, session.ConnectedClient); + }, session.Channel); } } // Keeping old plan diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs index 13ad963a0c..95f931cdd6 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs @@ -546,7 +546,7 @@ namespace Content.Server.NPC.Pathfinding if ((session.Value & PathfindingDebugMode.Routes) == 0x0) continue; - RaiseNetworkEvent(new PathRouteMessage(request.Polys.Select(GetDebugPoly).ToList(), new Dictionary()), session.Key.ConnectedClient); + RaiseNetworkEvent(new PathRouteMessage(request.Polys.Select(GetDebugPoly).ToList(), new Dictionary()), session.Key.Channel); } } @@ -614,7 +614,7 @@ namespace Content.Server.NPC.Pathfinding } } - RaiseNetworkEvent(msg, pSession.ConnectedClient); + RaiseNetworkEvent(msg, pSession.Channel); } private void SendRoute(PathRequest request) @@ -642,7 +642,7 @@ namespace Content.Server.NPC.Pathfinding if (!IsRoute(session.Value)) continue; - RaiseNetworkEvent(msg, session.Key.ConnectedClient); + RaiseNetworkEvent(msg, session.Key.Channel); } } @@ -664,7 +664,7 @@ namespace Content.Server.NPC.Pathfinding } } - RaiseNetworkEvent(msg, pSession.ConnectedClient); + RaiseNetworkEvent(msg, pSession.Channel); } private void SendBreadcrumbs(GridPathfindingChunk chunk, EntityUid gridUid) @@ -684,7 +684,7 @@ namespace Content.Server.NPC.Pathfinding if (!IsCrumb(session.Value)) continue; - RaiseNetworkEvent(msg, session.Key.ConnectedClient); + RaiseNetworkEvent(msg, session.Key.Channel); } } @@ -718,7 +718,7 @@ namespace Content.Server.NPC.Pathfinding if (!IsPoly(session.Value)) continue; - RaiseNetworkEvent(msg, session.Key.ConnectedClient); + RaiseNetworkEvent(msg, session.Key.Channel); } } diff --git a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs index 9ee9702c5b..5e31bd6872 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs @@ -394,7 +394,7 @@ namespace Content.Server.NodeContainer.EntitySystems foreach (var player in _visPlayers) { - RaiseNetworkEvent(msg, player.ConnectedClient); + RaiseNetworkEvent(msg, player.Channel); } } @@ -407,7 +407,7 @@ namespace Content.Server.NodeContainer.EntitySystems msg.Groups.Add(VisMakeGroupState(network)); } - RaiseNetworkEvent(msg, player.ConnectedClient); + RaiseNetworkEvent(msg, player.Channel); } private NodeVis.GroupData VisMakeGroupState(BaseNodeGroup group) diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs index bcc6f211ed..5949d57197 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; @@ -210,7 +210,7 @@ public sealed class PlayTimeTrackingManager Trackers = roles }; - _net.ServerSendMessage(msg, pSession.ConnectedClient); + _net.ServerSendMessage(msg, pSession.Channel); } /// diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs index e20291cc06..f5051741c0 100644 --- a/Content.Server/Prayer/PrayerSystem.cs +++ b/Content.Server/Prayer/PrayerSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Administration.Logs; using Content.Server.Bible.Components; using Content.Server.Chat.Managers; @@ -81,7 +81,7 @@ public sealed class PrayerSystem : EntitySystem var message = popupMessage == "" ? "" : popupMessage + (messageString == "" ? "" : $" \"{messageString}\""); _popupSystem.PopupEntity(popupMessage, target.AttachedEntity.Value, target, PopupType.Large); - _chatManager.ChatMessageToOne(ChatChannel.Local, messageString, message, EntityUid.Invalid, false, target.ConnectedClient); + _chatManager.ChatMessageToOne(ChatChannel.Local, messageString, message, EntityUid.Invalid, false, target.Channel); _adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(target.AttachedEntity.Value):player} received subtle message from {source.Name}: {message}"); } diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index a0b5e8ce65..bcbe99edf5 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -169,7 +169,7 @@ namespace Content.Server.Preferences.Managers // Should only be called via UserDbDataManager. public async Task LoadData(ICommonSession session, CancellationToken cancel) { - if (!ShouldStorePrefs(session.ConnectedClient.AuthType)) + if (!ShouldStorePrefs(session.Channel.AuthType)) { // Don't store data for guests. var prefsData = new PlayerPrefData @@ -202,7 +202,7 @@ namespace Content.Server.Preferences.Managers { MaxCharacterSlots = MaxCharacterSlots }; - _netManager.ServerSendMessage(msg, session.ConnectedClient); + _netManager.ServerSendMessage(msg, session.Channel); } } } diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs index 56806d8c9c..a5f74e09e9 100644 --- a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs +++ b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs @@ -34,7 +34,7 @@ public partial class RadiationSystem } var ev = new OnRadiationOverlayToggledEvent(isEnabled); - RaiseNetworkEvent(ev, session.ConnectedClient); + RaiseNetworkEvent(ev, session.Channel); } /// @@ -47,7 +47,7 @@ public partial class RadiationSystem { if (session.Status != SessionStatus.InGame) _debugSessions.Remove(session); - RaiseNetworkEvent(ev, session.ConnectedClient); + RaiseNetworkEvent(ev, session.Channel); } } diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs index adaad492dc..d18b044205 100644 --- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs +++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs @@ -100,7 +100,7 @@ public sealed class HeadsetSystem : SharedHeadsetSystem private void OnHeadsetReceive(EntityUid uid, HeadsetComponent component, ref RadioReceiveEvent args) { if (TryComp(Transform(uid).ParentUid, out ActorComponent? actor)) - _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.ConnectedClient); + _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel); } private void OnEmpPulse(EntityUid uid, HeadsetComponent component, ref EmpPulseEvent args) diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs index 8eccd4be69..8569d51d59 100644 --- a/Content.Server/Radio/EntitySystems/RadioSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs @@ -51,7 +51,7 @@ public sealed class RadioSystem : EntitySystem private void OnIntrinsicReceive(EntityUid uid, IntrinsicRadioReceiverComponent component, ref RadioReceiveEvent args) { if (TryComp(uid, out ActorComponent? actor)) - _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.ConnectedClient); + _netMan.ServerSendMessage(args.ChatMsg, actor.PlayerSession.Channel); } /// diff --git a/Content.Server/Sandbox/SandboxSystem.cs b/Content.Server/Sandbox/SandboxSystem.cs index 194cf59843..b8bf123090 100644 --- a/Content.Server/Sandbox/SandboxSystem.cs +++ b/Content.Server/Sandbox/SandboxSystem.cs @@ -94,7 +94,7 @@ namespace Content.Server.Sandbox if (e.NewStatus != SessionStatus.Connected || e.OldStatus != SessionStatus.Connecting) return; - RaiseNetworkEvent(new MsgSandboxStatus { SandboxAllowed = IsSandboxEnabled }, e.Session.ConnectedClient); + RaiseNetworkEvent(new MsgSandboxStatus { SandboxAllowed = IsSandboxEnabled }, e.Session.Channel); } private void SandboxRespawnReceived(MsgSandboxRespawn message, EntitySessionEventArgs args) @@ -102,7 +102,7 @@ namespace Content.Server.Sandbox if (!IsSandboxEnabled) return; - var player = _playerManager.GetSessionByChannel(args.SenderSession.ConnectedClient); + var player = _playerManager.GetSessionByChannel(args.SenderSession.Channel); if (player.AttachedEntity == null) return; _ticker.Respawn(player); @@ -113,7 +113,7 @@ namespace Content.Server.Sandbox if (!IsSandboxEnabled) return; - var player = _playerManager.GetSessionByChannel(args.SenderSession.ConnectedClient); + var player = _playerManager.GetSessionByChannel(args.SenderSession.Channel); if (player.AttachedEntity is not { } attached) { return; @@ -174,7 +174,7 @@ namespace Content.Server.Sandbox if (!IsSandboxEnabled) return; - var player = _playerManager.GetSessionByChannel(args.SenderSession.ConnectedClient); + var player = _playerManager.GetSessionByChannel(args.SenderSession.Channel); _host.ExecuteCommand(player, _conGroupController.CanCommand(player, "aghost") ? "aghost" : "ghost"); } @@ -184,7 +184,7 @@ namespace Content.Server.Sandbox if (!IsSandboxEnabled) return; - var player = _playerManager.GetSessionByChannel(args.SenderSession.ConnectedClient); + var player = _playerManager.GetSessionByChannel(args.SenderSession.Channel); _host.ExecuteCommand(player, "suicide"); } diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index e1366fb1eb..85c7271c1c 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -80,7 +80,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem var msg = Loc.GetString("laws-notify"); var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg)); _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, - actor.PlayerSession.ConnectedClient, colorOverride: Color.FromHex("#2ed2fd")); + actor.PlayerSession.Channel, colorOverride: Color.FromHex("#2ed2fd")); } private void OnToggleLawsScreen(EntityUid uid, SiliconLawBoundComponent component, ToggleLawsScreenEvent args) @@ -282,7 +282,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem var msg = Loc.GetString("laws-update-notify"); var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", msg)); - _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.ConnectedClient, colorOverride: Color.Red); + _chatManager.ChatMessageToOne(ChatChannel.Server, msg, wrappedMessage, default, false, actor.PlayerSession.Channel, colorOverride: Color.Red); } /// diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs index c13df410a0..7bfc496dea 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Server.GameTicking; using Content.Server.Station.Components; @@ -522,7 +522,7 @@ public sealed partial class StationJobsSystem : EntitySystem private void OnPlayerJoinedLobby(PlayerJoinedLobbyEvent ev) { - RaiseNetworkEvent(_cachedAvailableJobs, ev.PlayerSession.ConnectedClient); + RaiseNetworkEvent(_cachedAvailableJobs, ev.PlayerSession.Channel); } private void OnStationRenamed(EntityUid uid, StationJobsComponent component, StationRenamedEvent args) diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs index 8f1bc7005d..f16f3f01e9 100644 --- a/Content.Server/Tabletop/TabletopSystem.Session.cs +++ b/Content.Server/Tabletop/TabletopSystem.Session.cs @@ -89,7 +89,7 @@ namespace Content.Server.Tabletop session.Players[player] = new TabletopSessionPlayerData { Camera = camera }; // Tell the gamer to open a viewport for the tabletop game - RaiseNetworkEvent(new TabletopPlayEvent(GetNetEntity(uid), GetNetEntity(camera), Loc.GetString(tabletop.BoardName), tabletop.Size), player.ConnectedClient); + RaiseNetworkEvent(new TabletopPlayEvent(GetNetEntity(uid), GetNetEntity(camera), Loc.GetString(tabletop.BoardName), tabletop.Size), player.Channel); } /// diff --git a/Content.Server/Verbs/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs index 114c62a0ce..ebb3bb1df3 100644 --- a/Content.Server/Verbs/VerbSystem.cs +++ b/Content.Server/Verbs/VerbSystem.cs @@ -59,7 +59,7 @@ namespace Content.Server.Verbs var response = new VerbsResponseEvent(args.EntityUid, GetLocalVerbs(GetEntity(args.EntityUid), attached, verbTypes, force)); - RaiseNetworkEvent(response, player.ConnectedClient); + RaiseNetworkEvent(response, player.Channel); } /// diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index d57d3e74ff..5bd18cd8c4 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -273,7 +273,7 @@ namespace Content.Server.Voting.Managers msg.Options[i] = ((ushort) entry.Votes, entry.Text); } - player.ConnectedClient.SendMessage(msg); + player.Channel.SendMessage(msg); } private void DirtyCanCallVoteAll() @@ -303,7 +303,7 @@ namespace Content.Server.Voting.Managers msg.VotesUnavailable = votesUnavailable.ToArray(); } - _netManager.ServerSendMessage(msg, player.ConnectedClient); + _netManager.ServerSendMessage(msg, player.Channel); } private bool CanCallVote( diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs index 165b8dcae2..ab06130621 100644 --- a/Content.Server/Whitelist/WhitelistCommands.cs +++ b/Content.Server/Whitelist/WhitelistCommands.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.Database; using Content.Shared.Administration; using Content.Shared.CCVar; @@ -137,7 +137,7 @@ public sealed class KickNonWhitelistedCommand : LocalizedCommands if (!await db.GetWhitelistStatusAsync(session.UserId)) { - net.DisconnectChannel(session.ConnectedClient, Loc.GetString("whitelist-not-whitelisted")); + net.DisconnectChannel(session.Channel, Loc.GetString("whitelist-not-whitelisted")); } } }