GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced NetId constructor with ServerNetId static

Browse Source
This commit is contained in:
Albin Corén 2018-04-03 18:22:26 +02:00
parent fba648c31a
commit 3d06ad177d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MLAPI/MonoBehaviours/Core/NetworkingManager.cs
View File

@ -1288,7 +1288,7 @@ namespace MLAPI.MonoBehaviours.Core
else if(netId.IsHost()) else if(netId.IsHost())
{ {
//Client trying to send data to host //Client trying to send data to host
netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false); netId = NetId.ServerNetId;
} }
bool isPassthrough = (!isServer && clientId != NetId.ServerNetId.GetClientId() && NetworkConfig.AllowPassthroughMessages); bool isPassthrough = (!isServer && clientId != NetId.ServerNetId.GetClientId() && NetworkConfig.AllowPassthroughMessages);
@ -1342,7 +1342,7 @@ namespace MLAPI.MonoBehaviours.Core
} }
byte error; byte error;
if (isPassthrough) if (isPassthrough)
netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false); netId = NetId.ServerNetId;
if (skipQueue) if (skipQueue)
NetworkTransport.Send(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error); NetworkTransport.Send(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error);
else else
@ -1391,7 +1391,7 @@ namespace MLAPI.MonoBehaviours.Core
else if (netId.IsHost()) else if (netId.IsHost())
{ {
//Client trying to send data to host //Client trying to send data to host
netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false); netId = NetId.ServerNetId;
} }
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);
@ -1441,7 +1441,7 @@ namespace MLAPI.MonoBehaviours.Core
else if (netId.IsHost()) else if (netId.IsHost())
{ {
//Client trying to send data to host //Client trying to send data to host
netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false); netId = NetId.ServerNetId;
} }
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);
@ -1491,7 +1491,7 @@ namespace MLAPI.MonoBehaviours.Core
else if (netId.IsHost()) else if (netId.IsHost())
{ {
//Client trying to send data to host //Client trying to send data to host
netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false); netId = NetId.ServerNetId;
} }
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);
@ -1544,7 +1544,7 @@ namespace MLAPI.MonoBehaviours.Core
else if (netId.IsHost()) else if (netId.IsHost())
{ {
//Client trying to send data to host //Client trying to send data to host
netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false); netId = NetId.ServerNetId;
} }
byte error; byte error;
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error); NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);