Skip to content

Commit 7eeb53f

Browse files
committed
Cleaned up methods with arrow syntax
1 parent 9d1d587 commit 7eeb53f

File tree

3 files changed

+14
-35
lines changed

3 files changed

+14
-35
lines changed

MLAPI/Data/Transports/UNET/RelayTransport.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ private enum MessageType
2525
private static ushort port;
2626
private static List<ChannelQOS> channels = new List<ChannelQOS>();
2727

28-
public static bool Enabled { get { return NetworkingManager.singleton.NetworkConfig.RelayEnabled; } }
29-
public static string RelayAddress { get { return NetworkingManager.singleton.NetworkConfig.RelayAddress; } }
30-
public static ushort RelayPort { get { return NetworkingManager.singleton.NetworkConfig.RelayPort; } }
28+
public static bool Enabled => NetworkingManager.singleton.NetworkConfig.RelayEnabled;
29+
public static string RelayAddress => NetworkingManager.singleton.NetworkConfig.RelayAddress;
30+
public static ushort RelayPort => NetworkingManager.singleton.NetworkConfig.RelayPort;
3131

3232
public static int Connect(int hostId, string serverAddress, int serverPort, int exceptionConnectionId, out byte error)
3333
{

MLAPI/Data/Transports/UNET/RelayedTransport.cs

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@ namespace MLAPI.Data.Transports.UNET
66
{
77
class RelayedTransport : IUDPTransport
88
{
9-
public ChannelType InternalChannel { get => ChannelType.ReliableFragmentedSequenced; }
10-
11-
public uint HostDummyId { get => new NetId(0, 0, true, false).GetClientId(); }
12-
13-
public uint InvalidDummyId { get => new NetId(0, 0, false, true).GetClientId(); }
14-
15-
public uint ServerNetId { get => new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false).GetClientId(); }
16-
9+
public ChannelType InternalChannel => ChannelType.ReliableFragmentedSequenced;
10+
public uint HostDummyId => new NetId(0, 0, true, false).GetClientId();
11+
public uint InvalidDummyId => new NetId(0, 0, false, true).GetClientId();
12+
public uint ServerNetId => new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false).GetClientId();
1713
public int serverConnectionId;
1814
public int serverHostId;
1915

20-
public static List<TransportHost> ServerTransports = new List<TransportHost>()
16+
public static readonly List<TransportHost> ServerTransports = new List<TransportHost>()
2117
{
2218
new TransportHost()
2319
{
@@ -39,26 +35,18 @@ public void DisconnectClient(uint clientId)
3935
NetId netId = new NetId(clientId);
4036
if (netId.IsHost() || netId.IsInvalid())
4137
return;
42-
byte error;
43-
RelayTransport.Disconnect(netId.HostId, netId.ConnectionId, out error);
38+
RelayTransport.Disconnect(netId.HostId, netId.ConnectionId, out byte error);
4439
}
4540

46-
public void DisconnectFromServer()
47-
{
48-
byte error;
49-
RelayTransport.Disconnect(serverHostId, serverConnectionId, out error);
50-
}
41+
public void DisconnectFromServer() => RelayTransport.Disconnect(serverHostId, serverConnectionId, out byte error);
5142

5243
public int GetCurrentRTT(uint clientId, out byte error)
5344
{
5445
NetId netId = new NetId(clientId);
5546
return NetworkTransport.GetCurrentRTT(netId.HostId, netId.ConnectionId, out error);
5647
}
5748

58-
public int GetNetworkTimestamp()
59-
{
60-
return NetworkTransport.GetNetworkTimestamp();
61-
}
49+
public int GetNetworkTimestamp() => NetworkTransport.GetNetworkTimestamp();
6250

6351
public int GetRemoteDelayTimeMS(uint clientId, int remoteTimestamp, out byte error)
6452
{
@@ -68,10 +56,7 @@ public int GetRemoteDelayTimeMS(uint clientId, int remoteTimestamp, out byte err
6856

6957
public NetEventType PollReceive(out uint clientId, out int channelId, ref byte[] data, int bufferSize, out int receivedSize, out byte error)
7058
{
71-
int hostId;
72-
int connectionId;
73-
byte err;
74-
NetworkEventType eventType = RelayTransport.Receive(out hostId, out connectionId, out channelId, data, bufferSize, out receivedSize, out err);
59+
NetworkEventType eventType = RelayTransport.Receive(out int hostId, out int connectionId, out channelId, data, bufferSize, out receivedSize, out byte err);
7560
clientId = new NetId((byte)hostId, (ushort)connectionId, false, false).GetClientId();
7661
NetworkError errorType = (NetworkError)err;
7762
if (errorType == NetworkError.Timeout)
@@ -109,10 +94,7 @@ public void QueueMessageForSending(uint clientId, ref byte[] dataBuffer, int dat
10994
RelayTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channelId, dataBuffer, dataSize, out error);
11095
}
11196

112-
public void Shutdown()
113-
{
114-
NetworkTransport.Shutdown();
115-
}
97+
public void Shutdown() => NetworkTransport.Shutdown();
11698

11799
public void SendQueue(uint clientId, out byte error)
118100
{

MLAPI/Data/Transports/UNET/UnetTransport.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ public void QueueMessageForSending(uint clientId, ref byte[] dataBuffer, int dat
9696
NetworkTransport.QueueMessageForSending(netId.HostId, netId.ConnectionId, channelId, dataBuffer, dataSize, out error);
9797
}
9898

99-
public void Shutdown()
100-
{
101-
NetworkTransport.Shutdown();
102-
}
99+
public void Shutdown() => NetworkTransport.Shutdown();
103100

104101
public void SendQueue(uint clientId, out byte error)
105102
{

0 commit comments

Comments
 (0)