Replaced NetId constructor with ServerNetId static

TwoTenPvP · TwoTenPvP · commit 3d06ad177d6e · 2018-04-03T18:22:26.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -1288,7 +1288,7 @@ internal void Send(uint clientId, string messageType, string channelName, byte[]
             else if(netId.IsHost())
             {
                 //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);
@@ -1342,7 +1342,7 @@ internal void Send(uint clientId, string messageType, string channelName, byte[]
                 }
                 byte error;
                 if (isPassthrough)
-                    netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);
+                    netId = NetId.ServerNetId;
                 if (skipQueue)
                     NetworkTransport.Send(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error);
                 else
@@ -1391,7 +1391,7 @@ internal void Send(uint[] clientIds, string messageType, string channelName, byt
                     else if (netId.IsHost())
                     {
                         //Client trying to send data to host
-                        netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);
+                        netId = NetId.ServerNetId;
                     }
                     byte error;
                     NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);
@@ -1441,7 +1441,7 @@ internal void Send(List<uint> clientIds, string messageType, string channelName,
                     else if (netId.IsHost())
                     {
                         //Client trying to send data to host
-                        netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);
+                        netId = NetId.ServerNetId;
                     }
                     byte error;
                     NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);
@@ -1491,7 +1491,7 @@ internal void Send(string messageType, string channelName, byte[] data, uint? ne
                     else if (netId.IsHost())
                     {
                         //Client trying to send data to host
-                        netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);
+                        netId = NetId.ServerNetId;
                     }
                     byte error;
                     NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);
@@ -1544,7 +1544,7 @@ internal void Send(string messageType, string channelName, byte[] data, uint cli
                     else if (netId.IsHost())
                     {
                         //Client trying to send data to host
-                        netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);
+                        netId = NetId.ServerNetId;
                     }
                     byte error;
                     NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);

Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,7 @@ internal void Send(uint clientId, string messageType, string channelName, byte[]`
`1288`	`1288`	`else if(netId.IsHost())`
`1289`	`1289`	`{`
`1290`	`1290`	`//Client trying to send data to host`
`1291`		`- netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);`
	`1291`	`+ netId = NetId.ServerNetId;`
`1292`	`1292`	`}`
`1293`	`1293`
`1294`	`1294`	`bool isPassthrough = (!isServer && clientId != NetId.ServerNetId.GetClientId() && NetworkConfig.AllowPassthroughMessages);`
`@@ -1342,7 +1342,7 @@ internal void Send(uint clientId, string messageType, string channelName, byte[]`
`1342`	`1342`	`}`
`1343`	`1343`	`byte error;`
`1344`	`1344`	`if (isPassthrough)`
`1345`		`- netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);`
	`1345`	`+ netId = NetId.ServerNetId;`
`1346`	`1346`	`if (skipQueue)`
`1347`	`1347`	`NetworkTransport.Send(netId.HostId, netId.ConnectionId, MessageManager.channels[channelName], stream.GetBuffer(), sizeOfStream, out error);`
`1348`	`1348`	`else`
`@@ -1391,7 +1391,7 @@ internal void Send(uint[] clientIds, string messageType, string channelName, byt`
`1391`	`1391`	`else if (netId.IsHost())`
`1392`	`1392`	`{`
`1393`	`1393`	`//Client trying to send data to host`
`1394`		`- netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);`
	`1394`	`+ netId = NetId.ServerNetId;`
`1395`	`1395`	`}`
`1396`	`1396`	`byte error;`
`1397`	`1397`	`NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);`
`@@ -1441,7 +1441,7 @@ internal void Send(List<uint> clientIds, string messageType, string channelName,`
`1441`	`1441`	`else if (netId.IsHost())`
`1442`	`1442`	`{`
`1443`	`1443`	`//Client trying to send data to host`
`1444`		`- netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);`
	`1444`	`+ netId = NetId.ServerNetId;`
`1445`	`1445`	`}`
`1446`	`1446`	`byte error;`
`1447`	`1447`	`NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);`
`@@ -1491,7 +1491,7 @@ internal void Send(string messageType, string channelName, byte[] data, uint? ne`
`1491`	`1491`	`else if (netId.IsHost())`
`1492`	`1492`	`{`
`1493`	`1493`	`//Client trying to send data to host`
`1494`		`- netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);`
	`1494`	`+ netId = NetId.ServerNetId;`
`1495`	`1495`	`}`
`1496`	`1496`	`byte error;`
`1497`	`1497`	`NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);`
`@@ -1544,7 +1544,7 @@ internal void Send(string messageType, string channelName, byte[] data, uint cli`
`1544`	`1544`	`else if (netId.IsHost())`
`1545`	`1545`	`{`
`1546`	`1546`	`//Client trying to send data to host`
`1547`		`- netId = new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false);`
	`1547`	`+ netId = NetId.ServerNetId;`
`1548`	`1548`	`}`
`1549`	`1549`	`byte error;`
`1550`	`1550`	`NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channel, stream.GetBuffer(), sizeOfStream, out error);`