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

Makes a few EntitySystems use the RaiseNetworkedEvent helper instead of manually calling IEntityNetworkManager.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-04-14 14:12:11 +02:00
parent f257846de7
commit 2a95f5c4b6
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
View File

@@ -132,12 +132,12 @@ namespace Content.Client.GameObjects.EntitySystems.AI
if (tooltip == PathfindingDebugMode.Graph)
{
EntityManager.EntityNetManager.SendSystemNetworkMessage(new SharedAiDebug.RequestPathfindingGraphMessage());
RaiseNetworkEvent(new SharedAiDebug.RequestPathfindingGraphMessage());
}
if (tooltip == PathfindingDebugMode.Regions)
{
EntityManager.EntityNetManager.SendSystemNetworkMessage(new SharedAiDebug.SubscribeReachableMessage());
RaiseNetworkEvent(new SharedAiDebug.SubscribeReachableMessage());
}
// TODO: Request region graph, although the client system messages didn't seem to be going through anymore
@@ -148,7 +148,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI
{
if (mode == PathfindingDebugMode.Regions && (_modes & PathfindingDebugMode.Regions) != 0)
{
EntityManager.EntityNetManager.SendSystemNetworkMessage(new SharedAiDebug.UnsubscribeReachableMessage());
RaiseNetworkEvent(new SharedAiDebug.UnsubscribeReachableMessage());
}
_modes &= ~mode;

1
Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
View File

@@ -19,7 +19,6 @@ namespace Content.Client.GameObjects.EntitySystems
{
[Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
public override void Initialize()
{

6
Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
routeDebug.TimeTaken
);
EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage);
RaiseNetworkEvent(systemMessage);
}
private void DispatchJpsDebug(SharedAiDebug.JpsRouteDebug routeDebug)
@@ -90,7 +90,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
routeDebug.TimeTaken
);
EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage);
RaiseNetworkEvent(systemMessage);
}
private void DispatchGraph(SharedAiDebug.RequestPathfindingGraphMessage message)
@@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
}
var systemMessage = new SharedAiDebug.PathfindingGraphMessage(result);
EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage);
RaiseNetworkEvent(systemMessage);
}
}
#endif

2
Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI
private void NotifyActionJob(SharedAiDebug.UtilityAiDebugMessage message)
{
EntityManager.EntityNetManager.SendSystemNetworkMessage(message);
RaiseNetworkEvent(message);
}
}
#endif

2
Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs
View File

@@ -68,7 +68,7 @@ namespace Content.Server.GameObjects.EntitySystems.GameMode
EndTime = EndTime
};
EntityNetworkManager.SendSystemNetworkMessage(msg, player.ConnectedClient);
EntityManager.EntityNetworkManager?.SendSystemNetworkMessage(msg, player.ConnectedClient);
}
void IResettingEntitySystem.Reset()