This commit is contained in:
parent
d22cef8990
commit
aceed70611
|
@ -34,8 +34,8 @@ namespace BITKit.Entities
|
||||||
[SerializeReference, SubclassSelector]private INetClient client;
|
[SerializeReference, SubclassSelector]private INetClient client;
|
||||||
[SerializeReference, SubclassSelector]private INetServer server;
|
[SerializeReference, SubclassSelector]private INetServer server;
|
||||||
|
|
||||||
private INetProvider clientNetProvider => client.Source as INetProvider;
|
private INetProvider clientNetProvider => client?.Source as INetProvider;
|
||||||
private INetProvider serverNetProvider => server.Source as INetProvider;
|
private INetProvider serverNetProvider => server?.Source as INetProvider;
|
||||||
|
|
||||||
[Inject]
|
[Inject]
|
||||||
private IEntityBinaryHeader _playerHeader;
|
private IEntityBinaryHeader _playerHeader;
|
||||||
|
@ -50,9 +50,9 @@ namespace BITKit.Entities
|
||||||
{
|
{
|
||||||
ticker.Add(Tick);
|
ticker.Add(Tick);
|
||||||
|
|
||||||
clientNetProvider.AddCommandListener<EntitiesNetSyncBatchCommand>(_batchCommands.Enqueue);
|
clientNetProvider?.AddCommandListener<EntitiesNetSyncBatchCommand>(_batchCommands.Enqueue);
|
||||||
|
|
||||||
serverNetProvider.AddCommandListener<EntitiesNetSyncCommand>(_syncCommands.Enqueue);
|
serverNetProvider?.AddCommandListener<EntitiesNetSyncCommand>(_syncCommands.Enqueue);
|
||||||
|
|
||||||
playerService.OnPlayerInitialized+=OnPlayerInitialized;
|
playerService.OnPlayerInitialized+=OnPlayerInitialized;
|
||||||
playerService.OnPlayerDisposed += OnPlayerDisposed;
|
playerService.OnPlayerDisposed += OnPlayerDisposed;
|
||||||
|
@ -123,7 +123,7 @@ namespace BITKit.Entities
|
||||||
|
|
||||||
if (client.IsConnected is false && server.IsRunningServer is false) return;
|
if (client.IsConnected is false && server.IsRunningServer is false) return;
|
||||||
using var memoryStream = new MemoryStream();
|
using var memoryStream = new MemoryStream();
|
||||||
if (client.IsConnected && _playerEntity as Entity && _playerHeader != null)
|
if (client is {IsConnected:true}&& _playerEntity as Entity && _playerHeader != null)
|
||||||
{
|
{
|
||||||
using var writer = new BinaryWriter(memoryStream);
|
using var writer = new BinaryWriter(memoryStream);
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ namespace BITKit.Entities
|
||||||
};
|
};
|
||||||
clientNetProvider.ServerCommand(command);
|
clientNetProvider.ServerCommand(command);
|
||||||
}
|
}
|
||||||
else if (server.IsRunningServer)
|
else if (server is {IsRunningServer:true})
|
||||||
{
|
{
|
||||||
using var writer = new BinaryWriter(memoryStream);
|
using var writer = new BinaryWriter(memoryStream);
|
||||||
|
|
||||||
|
|
|
@ -176,7 +176,7 @@ namespace BITKit.Net
|
||||||
_netServerImplementation1.StopServer(dispose);
|
_netServerImplementation1.StopServer(dispose);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsRunningServer => _netServerImplementation1.IsRunningServer;
|
public bool IsRunningServer => _netServerImplementation1 is { IsRunningServer: true };
|
||||||
|
|
||||||
public void SendMessageToClient(int id, string message)
|
public void SendMessageToClient(int id, string message)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue