Skip to content

Commit 2d27df5

Browse files
TwoTenPvPTwoTenPvP
committed
Cleaned up syntax & fixed FieldType read issues
1 parent a106104 commit 2d27df5

File tree

5 files changed

+37
-59
lines changed

5 files changed

+37
-59
lines changed

‎MLAPI/Data/FieldType.cs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,14 @@ internal static void WriteFieldType(BitWriter writer, object newValue, object ol
147147
writer.WriteUShort((ushort)newValue);
148148
else if (newValue is string)
149149
writer.WriteString((string)newValue);
150-
else if (newValue is Vector3)
150+
else if (newValue is Vector3 vector3)
151151
{
152-
Vector3 vector3 = (Vector3)newValue;
153152
writer.WriteFloat(vector3.x);
154153
writer.WriteFloat(vector3.y);
155154
writer.WriteFloat(vector3.z);
156155
}
157-
else if (newValue is Vector2)
156+
else if (newValue is Vector2 vector2)
158157
{
159-
Vector2 vector2 = (Vector2)newValue;
160158
writer.WriteFloat(vector2.x);
161159
writer.WriteFloat(vector2.y);
162160
}
@@ -257,26 +255,29 @@ internal static object ReadFieldType(BitReader reader, Type type, object oldObje
257255
return reader.ReadString();
258256
else if (type == typeof(Vector3))
259257
{
260-
Vector3 vector3 = new Vector3();
261-
vector3.x = reader.ReadFloat();
262-
vector3.x = reader.ReadFloat();
263-
vector3.y = reader.ReadFloat();
264-
return vector3;
258+
return new Vector3
259+
{
260+
x = reader.ReadFloat(),
261+
y = reader.ReadFloat(),
262+
z = reader.ReadFloat()
263+
};
265264
}
266265
else if (type == typeof(Vector2))
267266
{
268-
Vector2 vector2 = new Vector2();
269-
vector2.x = reader.ReadFloat();
270-
vector2.x = reader.ReadFloat();
271-
return vector2;
267+
return new Vector2()
268+
{
269+
x = reader.ReadFloat(),
270+
y = reader.ReadFloat()
271+
};
272272
}
273273
else if (type == typeof(Quaternion))
274274
{
275-
Vector3 euler = new Vector3();
276-
euler.x = reader.ReadFloat();
277-
euler.x = reader.ReadFloat();
278-
euler.y = reader.ReadFloat();
279-
return Quaternion.Euler(euler);
275+
return Quaternion.Euler(new Vector3
276+
{
277+
x = reader.ReadFloat(),
278+
y = reader.ReadFloat(),
279+
z = reader.ReadFloat()
280+
});
280281
}
281282
else
282283
{

‎MLAPI/Data/Transports/UNET/UnetTransport.cs

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@ namespace MLAPI.Data.Transports.UNET
99
[Serializable]
1010
public class UnetTransport : IUDPTransport
1111
{
12-
public ChannelType InternalChannel { get => ChannelType.ReliableFragmentedSequenced; }
13-
14-
public uint HostDummyId { get => new NetId(0,0,true,false).GetClientId(); }
15-
16-
public uint InvalidDummyId { get => new NetId(0, 0, false, true).GetClientId(); }
17-
18-
public uint ServerNetId { get => new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false).GetClientId(); }
19-
12+
public ChannelType InternalChannel => ChannelType.ReliableFragmentedSequenced;
13+
public uint HostDummyId => new NetId(0, 0, true, false).GetClientId();
14+
public uint InvalidDummyId => new NetId(0, 0, false, true).GetClientId();
15+
public uint ServerNetId => new NetId((byte)serverHostId, (ushort)serverConnectionId, false, false).GetClientId();
2016
public int serverConnectionId;
2117
public int serverHostId;
22-
23-
public static List<TransportHost> ServerTransports = new List<TransportHost>()
18+
public static readonly List<TransportHost> ServerTransports = new List<TransportHost>()
2419
{
2520
new TransportHost()
2621
{
@@ -42,26 +37,18 @@ public void DisconnectClient(uint clientId)
4237
NetId netId = new NetId(clientId);
4338
if (netId.IsHost() || netId.IsInvalid())
4439
return;
45-
byte error;
46-
NetworkTransport.Disconnect(netId.HostId, netId.ConnectionId, out error);
40+
NetworkTransport.Disconnect(netId.HostId, netId.ConnectionId, out byte error);
4741
}
4842

49-
public void DisconnectFromServer()
50-
{
51-
byte error;
52-
NetworkTransport.Disconnect(serverHostId, serverConnectionId, out error);
53-
}
43+
public void DisconnectFromServer() => NetworkTransport.Disconnect(serverHostId, serverConnectionId, out byte error);
5444

5545
public int GetCurrentRTT(uint clientId, out byte error)
5646
{
5747
NetId netId = new NetId(clientId);
5848
return NetworkTransport.GetCurrentRTT(netId.HostId, netId.ConnectionId, out error);
5949
}
6050

61-
public int GetNetworkTimestamp()
62-
{
63-
return NetworkTransport.GetNetworkTimestamp();
64-
}
51+
public int GetNetworkTimestamp() => NetworkTransport.GetNetworkTimestamp();
6552

6653
public int GetRemoteDelayTimeMS(uint clientId, int remoteTimestamp, out byte error)
6754
{
@@ -71,10 +58,7 @@ public int GetRemoteDelayTimeMS(uint clientId, int remoteTimestamp, out byte err
7158

7259
public NetEventType PollReceive(out uint clientId, out int channelId, ref byte[] data, int bufferSize, out int receivedSize, out byte error)
7360
{
74-
int hostId;
75-
int connectionId;
76-
byte err;
77-
NetworkEventType eventType = NetworkTransport.Receive(out hostId, out connectionId, out channelId, data, bufferSize, out receivedSize, out err);
61+
NetworkEventType eventType = NetworkTransport.Receive(out int hostId, out int connectionId, out channelId, data, bufferSize, out receivedSize, out byte err);
7862
clientId = new NetId((byte)hostId, (ushort)connectionId, false, false).GetClientId();
7963
NetworkError errorType = (NetworkError)err;
8064
if (errorType == NetworkError.Timeout)

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,10 @@ protected int RegisterMessageHandler(string name, Action<uint, byte[]> action)
575575
return -1;
576576
}
577577

578-
Action<uint, BitReader> convertedAction = (clientId, reader) =>
578+
void convertedAction(uint clientId, BitReader reader)
579579
{
580580
action.Invoke(clientId, reader.ReadByteArray());
581-
};
581+
}
582582

583583
networkedObject.targetMessageActions[behaviourOrder].Add(messageType, convertedAction);
584584
int counter = MessageManager.AddIncomingMessageHandler(name, convertedAction);

‎MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ internal static void HandleConnectionApproved(uint clientId, BitReader reader, i
7171

7272
float netTime = reader.ReadFloat();
7373
int remoteStamp = reader.ReadInt();
74-
byte error;
75-
int msDelay = NetworkingManager.singleton.NetworkConfig.NetworkTransport.GetRemoteDelayTimeMS(clientId, remoteStamp, out error);
74+
int msDelay = NetworkingManager.singleton.NetworkConfig.NetworkTransport.GetRemoteDelayTimeMS(clientId, remoteStamp, out byte error);
7675
netManager.NetworkTime = netTime + (msDelay / 1000f);
7776

7877
netManager.ConnectedClients.Add(netManager.LocalClientId, new NetworkedClient() { ClientId = netManager.LocalClientId });
@@ -288,8 +287,7 @@ internal static void HandleTimeSync(uint clientId, BitReader reader, int channel
288287
float netTime = reader.ReadFloat();
289288
int timestamp = reader.ReadInt();
290289

291-
byte error;
292-
int msDelay = NetworkingManager.singleton.NetworkConfig.NetworkTransport.GetRemoteDelayTimeMS(clientId, timestamp, out error);
290+
int msDelay = NetworkingManager.singleton.NetworkConfig.NetworkTransport.GetRemoteDelayTimeMS(clientId, timestamp, out byte error);
293291
netManager.NetworkTime = netTime + (msDelay / 1000f);
294292
}
295293

‎MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Send.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ internal static void PassthroughSend(uint targetId, uint sourceId, ushort messag
3030

3131
writer.Finalize(ref FinalMessageBuffer);
3232

33-
byte error;
34-
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channelId, false, out error);
33+
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channelId, false, out byte error);
3534
}
3635
}
3736

@@ -133,8 +132,7 @@ internal static void Send(uint[] clientIds, string messageType, string channelNa
133132
writer.Finalize(ref FinalMessageBuffer);
134133

135134
NetworkProfiler.StartEvent(TickType.Send, (uint)messageWriter.GetFinalizeSize(), channelName, messageType);
136-
byte error;
137-
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out error);
135+
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out byte error);
138136
NetworkProfiler.EndEvent();
139137
}
140138
}
@@ -176,8 +174,7 @@ internal static void Send(List<uint> clientIds, string messageType, string chann
176174
writer.Finalize(ref FinalMessageBuffer);
177175

178176
NetworkProfiler.StartEvent(TickType.Send, (uint)messageWriter.GetFinalizeSize(), channelName, messageType);
179-
byte error;
180-
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out error);
177+
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out byte error);
181178
NetworkProfiler.EndEvent();
182179
}
183180
}
@@ -227,8 +224,7 @@ internal static ref List<uint> Send(string messageType, string channelName, BitW
227224
writer.Finalize(ref FinalMessageBuffer);
228225

229226
NetworkProfiler.StartEvent(TickType.Send, (uint)messageWriter.GetFinalizeSize(), channelName, messageType);
230-
byte error;
231-
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out error);
227+
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out byte error);
232228
NetworkProfiler.EndEvent();
233229
}
234230
return ref failedObservers;
@@ -279,8 +275,7 @@ internal static ref List<uint> Send(string messageType, string channelName, BitW
279275
writer.Finalize(ref FinalMessageBuffer);
280276

281277
NetworkProfiler.StartEvent(TickType.Send, (uint)messageWriter.GetFinalizeSize(), channelName, messageType);
282-
byte error;
283-
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out error);
278+
netManager.NetworkConfig.NetworkTransport.QueueMessageForSending(targetClientId, ref FinalMessageBuffer, (int)writer.GetFinalizeSize(), channel, false, out byte error);
284279
NetworkProfiler.EndEvent();
285280
}
286281
return ref failedObservers;

0 commit comments

Comments
 (0)