space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move INetManager dependency from PrototypeManager to Server/ClientPrototypeManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-04-14 14:55:26 +02:00
parent cbd7b62ad7
commit 013e6f7ce4
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Robust.Client/Prototypes/ClientPrototypeManager.cs
View File

@@ -19,6 +19,7 @@ namespace Robust.Client.Prototypes
public sealed class ClientPrototypeManager : PrototypeManager
{
[Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly INetManager _netManager = default!;
private readonly List<FileSystemWatcher> _watchers = new();
private readonly TimeSpan _reloadDelay = TimeSpan.FromMilliseconds(10);
@@ -29,7 +30,7 @@ namespace Robust.Client.Prototypes
{
base.Initialize();
NetManager.RegisterNetMessage<MsgReloadPrototypes>(MsgReloadPrototypes.NAME, accept: NetMessageAccept.Server);
_netManager.RegisterNetMessage<MsgReloadPrototypes>(MsgReloadPrototypes.NAME, accept: NetMessageAccept.Server);
_clyde.OnWindowFocused += WindowFocusedChanged;
@@ -56,9 +57,9 @@ namespace Robust.Client.Prototypes
#if !FULL_RELEASE
var sw = Stopwatch.StartNew();
var msg = NetManager.CreateNetMessage<MsgReloadPrototypes>();
var msg = _netManager.CreateNetMessage<MsgReloadPrototypes>();
msg.Paths = _reloadQueue.ToArray();
NetManager.ClientSendMessage(msg);
_netManager.ClientSendMessage(msg);
ReloadPrototypes(_reloadQueue);

3
Robust.Server/Prototypes/ServerPrototypeManager.cs
View File

@@ -13,6 +13,7 @@ namespace Robust.Server.Prototypes
{
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IConGroupController _conGroups = default!;
[Dependency] private readonly INetManager _netManager = default!;
public ServerPrototypeManager()
{
@@ -23,7 +24,7 @@ namespace Robust.Server.Prototypes
{
base.Initialize();
NetManager.RegisterNetMessage<MsgReloadPrototypes>(MsgReloadPrototypes.NAME, HandleReloadPrototypes, NetMessageAccept.Server);
_netManager.RegisterNetMessage<MsgReloadPrototypes>(MsgReloadPrototypes.NAME, HandleReloadPrototypes, NetMessageAccept.Server);
}
private void HandleReloadPrototypes(MsgReloadPrototypes msg)

1
Robust.Shared/Prototypes/PrototypeManager.cs
View File

@@ -200,7 +200,6 @@ namespace Robust.Shared.Prototypes
[Dependency] public readonly IResourceManager Resources = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] public readonly ITaskManager TaskManager = default!;
[Dependency] public readonly INetManager NetManager = default!;
[Dependency] private readonly ISerializationManager _serializationManager = default!;
private readonly Dictionary<string, Type> prototypeTypes = new();