diff --git a/Content.Server/Administration/GamePrototypeLoadManager.cs b/Content.Server/Administration/GamePrototypeLoadManager.cs index 39d16028ba..e955931815 100644 --- a/Content.Server/Administration/GamePrototypeLoadManager.cs +++ b/Content.Server/Administration/GamePrototypeLoadManager.cs @@ -49,7 +49,7 @@ public sealed class GamePrototypeLoadManager : IGamePrototypeLoadManager private void LoadPrototypeData(string prototypeData) { LoadedPrototypes.Add(prototypeData); - var msg = _netManager.CreateNetMessage(); + var msg = new GamePrototypeLoadMessage(); msg.PrototypeData = prototypeData; _netManager.ServerSendToAll(msg); // everyone load it up! _prototypeManager.LoadString(prototypeData, true); // server needs it too. @@ -63,7 +63,7 @@ public sealed class GamePrototypeLoadManager : IGamePrototypeLoadManager // Just dump all the prototypes on connect, before them missing could be an issue. foreach (var prototype in LoadedPrototypes) { - var msg = _netManager.CreateNetMessage(); + var msg = new GamePrototypeLoadMessage(); msg.PrototypeData = prototype; e.Channel.SendMessage(msg); } diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index c554750371..555dfffbaf 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -259,7 +259,7 @@ namespace Content.Server.Administration.Managers // NOTE: Also sends commands list for non admins.. private void UpdateAdminStatus(IPlayerSession session) { - var msg = _netMgr.CreateNetMessage(); + var msg = new MsgUpdateAdminStatus(); var commands = new List(_anyCommands); diff --git a/Content.Server/Administration/NetworkResourceManager.cs b/Content.Server/Administration/NetworkResourceManager.cs index c801919eab..25b8f9de93 100644 --- a/Content.Server/Administration/NetworkResourceManager.cs +++ b/Content.Server/Administration/NetworkResourceManager.cs @@ -73,7 +73,7 @@ public sealed class NetworkResourceManager : SharedNetworkResourceManager { foreach (var (path, data) in ContentRoot.GetAllFiles()) { - var msg = _serverNetManager.CreateNetMessage(); + var msg = new NetworkResourceUploadMessage(); msg.RelativePath = path; msg.Data = data; e.Channel.SendMessage(msg); diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 8e19289367..30a3f37380 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -229,7 +229,7 @@ namespace Content.Server.Chat.Managers public void ChatMessageToOne(ChatChannel channel, string message, string messageWrap, EntityUid source, bool hideChat, INetChannel client) { - var msg = _netManager.CreateNetMessage(); + var msg = new MsgChatMessage(); msg.Channel = channel; msg.Message = message; msg.MessageWrap = messageWrap; @@ -240,7 +240,7 @@ namespace Content.Server.Chat.Managers public void ChatMessageToMany(ChatChannel channel, string message, string messageWrap, EntityUid source, bool hideChat, List clients) { - var msg = _netManager.CreateNetMessage(); + var msg = new MsgChatMessage(); msg.Channel = channel; msg.Message = message; msg.MessageWrap = messageWrap; @@ -251,7 +251,7 @@ namespace Content.Server.Chat.Managers public void ChatMessageToAll(ChatChannel channel, string message, string messageWrap, Color? colorOverride = null) { - var msg = _netManager.CreateNetMessage(); + var msg = new MsgChatMessage(); msg.Channel = channel; msg.Message = message; msg.MessageWrap = messageWrap; diff --git a/Content.Server/EUI/BaseEui.cs b/Content.Server/EUI/BaseEui.cs index 097fbaa975..aac8aba3f7 100644 --- a/Content.Server/EUI/BaseEui.cs +++ b/Content.Server/EUI/BaseEui.cs @@ -83,7 +83,7 @@ namespace Content.Server.EUI public void SendMessage(EuiMessageBase message) { var netMgr = IoCManager.Resolve(); - var msg = netMgr.CreateNetMessage(); + var msg = new MsgEuiMessage(); msg.Id = Id; msg.Message = message; @@ -111,7 +111,7 @@ namespace Content.Server.EUI var state = GetNewState(); var netMgr = IoCManager.Resolve(); - var msg = netMgr.CreateNetMessage(); + var msg = new MsgEuiState(); msg.Id = Id; msg.State = state; diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs index 703d1f6216..a8ac932504 100644 --- a/Content.Server/EUI/EuiManager.cs +++ b/Content.Server/EUI/EuiManager.cs @@ -70,7 +70,7 @@ namespace Content.Server.EUI data.OpenUIs.Add(newId, eui); - var msg = _net.CreateNetMessage(); + var msg = new MsgEuiCtl(); msg.Id = newId; msg.Type = MsgEuiCtl.CtlType.Open; msg.OpenType = eui.GetType().Name; @@ -83,7 +83,7 @@ namespace Content.Server.EUI eui.Shutdown(); _playerData[eui.Player].OpenUIs.Remove(eui.Id); - var msg = _net.CreateNetMessage(); + var msg = new MsgEuiCtl(); msg.Id = eui.Id; msg.Type = MsgEuiCtl.CtlType.Close; _net.ServerSendMessage(msg, eui.Player.ConnectedClient); diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 9190d6f23d..99cbea426c 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -71,7 +71,7 @@ namespace Content.Server.GameTicking private void SendServerMessage(string message) { - var msg = _netManager.CreateNetMessage(); + var msg = new MsgChatMessage(); msg.Channel = ChatChannel.Server; msg.Message = message; IoCManager.Resolve().ServerSendToAll(msg); diff --git a/Content.Server/Ghost/Components/GhostRadioComponent.cs b/Content.Server/Ghost/Components/GhostRadioComponent.cs index 65b3cdd1c6..c3261e691e 100644 --- a/Content.Server/Ghost/Components/GhostRadioComponent.cs +++ b/Content.Server/Ghost/Components/GhostRadioComponent.cs @@ -29,7 +29,7 @@ namespace Content.Server.Ghost.Components var playerChannel = actor.PlayerSession.ConnectedClient; - var msg = _netManager.CreateNetMessage(); + var msg = new MsgChatMessage(); msg.Channel = ChatChannel.Radio; msg.Message = message; diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs index 1bdbefafac..64da4609a9 100644 --- a/Content.Server/Headset/HeadsetComponent.cs +++ b/Content.Server/Headset/HeadsetComponent.cs @@ -55,7 +55,7 @@ namespace Content.Server.Headset var playerChannel = actor.PlayerSession.ConnectedClient; - var msg = _netManager.CreateNetMessage(); + var msg = new MsgChatMessage(); msg.Channel = ChatChannel.Radio; msg.Message = message; diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs index 47cf6666e3..dc70070161 100644 --- a/Content.Server/Info/RulesManager.cs +++ b/Content.Server/Info/RulesManager.cs @@ -33,7 +33,7 @@ public sealed class RulesManager : SharedRulesManager return; } - var message = _netManager.CreateNetMessage(); + var message = new ShouldShowRulesPopupMessage(); _netManager.ServerSendMessage(message, e.Channel); } diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs index e523227c81..a7292e6e4b 100644 --- a/Content.Server/Info/ShowRulesCommand.cs +++ b/Content.Server/Info/ShowRulesCommand.cs @@ -58,7 +58,7 @@ public sealed class ShowRulesCommand : IConsoleCommand var netManager = IoCManager.Resolve(); - var message = netManager.CreateNetMessage(); + var message = new SharedRulesManager.ShowRulesPopupMessage(); message.PopupTime = seconds; var player = IoCManager.Resolve().GetSessionByUserId(located.UserId); diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index 0a51db7359..d978d11040 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -198,7 +198,7 @@ namespace Content.Server.Preferences.Managers var prefs = await GetOrCreatePreferencesAsync(session.UserId); prefsData.Prefs = prefs; - var msg = _netManager.CreateNetMessage(); + var msg = new MsgPreferencesAndSettings(); msg.Preferences = prefs; msg.Settings = new GameSettings { diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index e91988567d..bcedfe8db6 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -207,7 +207,7 @@ namespace Content.Server.StationEvents if (!_conGroupController.CanCommand(player, "events")) return; - var newMsg = _netManager.CreateNetMessage(); + var newMsg = new MsgStationEvents(); newMsg.Events = StationEvents.Select(e => e.Name).ToArray(); _netManager.ServerSendMessage(newMsg, player.ConnectedClient); } diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index 813f0a4d68..5036e626d6 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -229,7 +229,7 @@ namespace Content.Server.Voting.Managers private void SendSingleUpdate(VoteReg v, IPlayerSession player) { - var msg = _netManager.CreateNetMessage(); + var msg = new MsgVoteData(); msg.VoteId = v.Id; msg.VoteActive = !v.Finished; @@ -272,7 +272,7 @@ namespace Content.Server.Voting.Managers private void SendUpdateCanCallVote(IPlayerSession player) { - var msg = _netManager.CreateNetMessage(); + var msg = new MsgVoteCanCall(); msg.CanCall = CanCallVote(player, null, out var isAdmin, out var timeSpan); msg.WhenCanCallVote = timeSpan;