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

Remove usage of CreateNetMessage. (#7563)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-04-15 20:55:49 +02:00
committed by GitHub
parent 353a7aa210
commit b3e7c7af1f
14 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Administration/GamePrototypeLoadManager.cs
View File

@@ -49,7 +49,7 @@ public sealed class GamePrototypeLoadManager : IGamePrototypeLoadManager
private void LoadPrototypeData(string prototypeData) private void LoadPrototypeData(string prototypeData)
{ {
LoadedPrototypes.Add(prototypeData); LoadedPrototypes.Add(prototypeData);
var msg = _netManager.CreateNetMessage<GamePrototypeLoadMessage>(); var msg = new GamePrototypeLoadMessage();
msg.PrototypeData = prototypeData; msg.PrototypeData = prototypeData;
_netManager.ServerSendToAll(msg); // everyone load it up! _netManager.ServerSendToAll(msg); // everyone load it up!
_prototypeManager.LoadString(prototypeData, true); // server needs it too. _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. // Just dump all the prototypes on connect, before them missing could be an issue.
foreach (var prototype in LoadedPrototypes) foreach (var prototype in LoadedPrototypes)
{ {
var msg = _netManager.CreateNetMessage<GamePrototypeLoadMessage>(); var msg = new GamePrototypeLoadMessage();
msg.PrototypeData = prototype; msg.PrototypeData = prototype;
e.Channel.SendMessage(msg); e.Channel.SendMessage(msg);
} }

2
Content.Server/Administration/Managers/AdminManager.cs
View File

@@ -259,7 +259,7 @@ namespace Content.Server.Administration.Managers
// NOTE: Also sends commands list for non admins.. // NOTE: Also sends commands list for non admins..
private void UpdateAdminStatus(IPlayerSession session) private void UpdateAdminStatus(IPlayerSession session)
{ {
var msg = _netMgr.CreateNetMessage<MsgUpdateAdminStatus>(); var msg = new MsgUpdateAdminStatus();
var commands = new List<string>(_anyCommands); var commands = new List<string>(_anyCommands);

2
Content.Server/Administration/NetworkResourceManager.cs
View File

@@ -73,7 +73,7 @@ public sealed class NetworkResourceManager : SharedNetworkResourceManager
{ {
foreach (var (path, data) in ContentRoot.GetAllFiles()) foreach (var (path, data) in ContentRoot.GetAllFiles())
{ {
var msg = _serverNetManager.CreateNetMessage<NetworkResourceUploadMessage>(); var msg = new NetworkResourceUploadMessage();
msg.RelativePath = path; msg.RelativePath = path;
msg.Data = data; msg.Data = data;
e.Channel.SendMessage(msg); e.Channel.SendMessage(msg);

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

@@ -229,7 +229,7 @@ namespace Content.Server.Chat.Managers
public void ChatMessageToOne(ChatChannel channel, string message, string messageWrap, EntityUid source, bool hideChat, INetChannel client) public void ChatMessageToOne(ChatChannel channel, string message, string messageWrap, EntityUid source, bool hideChat, INetChannel client)
{ {
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = new MsgChatMessage();
msg.Channel = channel; msg.Channel = channel;
msg.Message = message; msg.Message = message;
msg.MessageWrap = messageWrap; 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<INetChannel> clients) public void ChatMessageToMany(ChatChannel channel, string message, string messageWrap, EntityUid source, bool hideChat, List<INetChannel> clients)
{ {
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = new MsgChatMessage();
msg.Channel = channel; msg.Channel = channel;
msg.Message = message; msg.Message = message;
msg.MessageWrap = messageWrap; msg.MessageWrap = messageWrap;
@@ -251,7 +251,7 @@ namespace Content.Server.Chat.Managers
public void ChatMessageToAll(ChatChannel channel, string message, string messageWrap, Color? colorOverride = null) public void ChatMessageToAll(ChatChannel channel, string message, string messageWrap, Color? colorOverride = null)
{ {
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = new MsgChatMessage();
msg.Channel = channel; msg.Channel = channel;
msg.Message = message; msg.Message = message;
msg.MessageWrap = messageWrap; msg.MessageWrap = messageWrap;

4
Content.Server/EUI/BaseEui.cs
View File

@@ -83,7 +83,7 @@ namespace Content.Server.EUI
public void SendMessage(EuiMessageBase message) public void SendMessage(EuiMessageBase message)
{ {
var netMgr = IoCManager.Resolve<IServerNetManager>(); var netMgr = IoCManager.Resolve<IServerNetManager>();
var msg = netMgr.CreateNetMessage<MsgEuiMessage>(); var msg = new MsgEuiMessage();
msg.Id = Id; msg.Id = Id;
msg.Message = message; msg.Message = message;
@@ -111,7 +111,7 @@ namespace Content.Server.EUI
var state = GetNewState(); var state = GetNewState();
var netMgr = IoCManager.Resolve<IServerNetManager>(); var netMgr = IoCManager.Resolve<IServerNetManager>();
var msg = netMgr.CreateNetMessage<MsgEuiState>(); var msg = new MsgEuiState();
msg.Id = Id; msg.Id = Id;
msg.State = state; msg.State = state;

4
Content.Server/EUI/EuiManager.cs
View File

@@ -70,7 +70,7 @@ namespace Content.Server.EUI
data.OpenUIs.Add(newId, eui); data.OpenUIs.Add(newId, eui);
var msg = _net.CreateNetMessage<MsgEuiCtl>(); var msg = new MsgEuiCtl();
msg.Id = newId; msg.Id = newId;
msg.Type = MsgEuiCtl.CtlType.Open; msg.Type = MsgEuiCtl.CtlType.Open;
msg.OpenType = eui.GetType().Name; msg.OpenType = eui.GetType().Name;
@@ -83,7 +83,7 @@ namespace Content.Server.EUI
eui.Shutdown(); eui.Shutdown();
_playerData[eui.Player].OpenUIs.Remove(eui.Id); _playerData[eui.Player].OpenUIs.Remove(eui.Id);
var msg = _net.CreateNetMessage<MsgEuiCtl>(); var msg = new MsgEuiCtl();
msg.Id = eui.Id; msg.Id = eui.Id;
msg.Type = MsgEuiCtl.CtlType.Close; msg.Type = MsgEuiCtl.CtlType.Close;
_net.ServerSendMessage(msg, eui.Player.ConnectedClient); _net.ServerSendMessage(msg, eui.Player.ConnectedClient);

2
Content.Server/GameTicking/GameTicker.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.GameTicking
private void SendServerMessage(string message) private void SendServerMessage(string message)
{ {
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = new MsgChatMessage();
msg.Channel = ChatChannel.Server; msg.Channel = ChatChannel.Server;
msg.Message = message; msg.Message = message;
IoCManager.Resolve<IServerNetManager>().ServerSendToAll(msg); IoCManager.Resolve<IServerNetManager>().ServerSendToAll(msg);

2
Content.Server/Ghost/Components/GhostRadioComponent.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.Ghost.Components
var playerChannel = actor.PlayerSession.ConnectedClient; var playerChannel = actor.PlayerSession.ConnectedClient;
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = new MsgChatMessage();
msg.Channel = ChatChannel.Radio; msg.Channel = ChatChannel.Radio;
msg.Message = message; msg.Message = message;

2
Content.Server/Headset/HeadsetComponent.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Server.Headset
var playerChannel = actor.PlayerSession.ConnectedClient; var playerChannel = actor.PlayerSession.ConnectedClient;
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = new MsgChatMessage();
msg.Channel = ChatChannel.Radio; msg.Channel = ChatChannel.Radio;
msg.Message = message; msg.Message = message;

2
Content.Server/Info/RulesManager.cs
View File

@@ -33,7 +33,7 @@ public sealed class RulesManager : SharedRulesManager
return; return;
} }
var message = _netManager.CreateNetMessage<ShouldShowRulesPopupMessage>(); var message = new ShouldShowRulesPopupMessage();
_netManager.ServerSendMessage(message, e.Channel); _netManager.ServerSendMessage(message, e.Channel);
} }

2
Content.Server/Info/ShowRulesCommand.cs
View File

@@ -58,7 +58,7 @@ public sealed class ShowRulesCommand : IConsoleCommand
var netManager = IoCManager.Resolve<INetManager>(); var netManager = IoCManager.Resolve<INetManager>();
var message = netManager.CreateNetMessage<SharedRulesManager.ShowRulesPopupMessage>(); var message = new SharedRulesManager.ShowRulesPopupMessage();
message.PopupTime = seconds; message.PopupTime = seconds;
var player = IoCManager.Resolve<IPlayerManager>().GetSessionByUserId(located.UserId); var player = IoCManager.Resolve<IPlayerManager>().GetSessionByUserId(located.UserId);

2
Content.Server/Preferences/Managers/ServerPreferencesManager.cs
View File

@@ -198,7 +198,7 @@ namespace Content.Server.Preferences.Managers
var prefs = await GetOrCreatePreferencesAsync(session.UserId); var prefs = await GetOrCreatePreferencesAsync(session.UserId);
prefsData.Prefs = prefs; prefsData.Prefs = prefs;
var msg = _netManager.CreateNetMessage<MsgPreferencesAndSettings>(); var msg = new MsgPreferencesAndSettings();
msg.Preferences = prefs; msg.Preferences = prefs;
msg.Settings = new GameSettings msg.Settings = new GameSettings
{ {

2
Content.Server/StationEvents/StationEventSystem.cs
View File

@@ -207,7 +207,7 @@ namespace Content.Server.StationEvents
if (!_conGroupController.CanCommand(player, "events")) if (!_conGroupController.CanCommand(player, "events"))
return; return;
var newMsg = _netManager.CreateNetMessage<MsgStationEvents>(); var newMsg = new MsgStationEvents();
newMsg.Events = StationEvents.Select(e => e.Name).ToArray(); newMsg.Events = StationEvents.Select(e => e.Name).ToArray();
_netManager.ServerSendMessage(newMsg, player.ConnectedClient); _netManager.ServerSendMessage(newMsg, player.ConnectedClient);
} }

4
Content.Server/Voting/Managers/VoteManager.cs
View File

@@ -229,7 +229,7 @@ namespace Content.Server.Voting.Managers
private void SendSingleUpdate(VoteReg v, IPlayerSession player) private void SendSingleUpdate(VoteReg v, IPlayerSession player)
{ {
var msg = _netManager.CreateNetMessage<MsgVoteData>(); var msg = new MsgVoteData();
msg.VoteId = v.Id; msg.VoteId = v.Id;
msg.VoteActive = !v.Finished; msg.VoteActive = !v.Finished;
@@ -272,7 +272,7 @@ namespace Content.Server.Voting.Managers
private void SendUpdateCanCallVote(IPlayerSession player) private void SendUpdateCanCallVote(IPlayerSession player)
{ {
var msg = _netManager.CreateNetMessage<MsgVoteCanCall>(); var msg = new MsgVoteCanCall();
msg.CanCall = CanCallVote(player, null, out var isAdmin, out var timeSpan); msg.CanCall = CanCallVote(player, null, out var isAdmin, out var timeSpan);
msg.WhenCanCallVote = timeSpan; msg.WhenCanCallVote = timeSpan;