Skip to content

Commit 36e8c79

Browse files
TwoTenPvPTwoTenPvP
committed
Added warnings when trying to send a message on a invalid MessageType
1 parent 76e720d commit 36e8c79

File tree

1 file changed

+71
-1
lines changed

1 file changed

+71
-1
lines changed

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,12 @@ private void SetDirtyness()
923923
/// <param name="data">The binary data to send</param>
924924
protected void SendToServer(string messageType, string channelName, byte[] data)
925925
{
926-
if(MessageManager.messageTypes[messageType] < 32)
926+
if (!MessageManager.messageTypes.ContainsKey(messageType))
927+
{
928+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
929+
return;
930+
}
931+
if (MessageManager.messageTypes[messageType] < 32)
927932
{
928933
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
929934
return;
@@ -956,6 +961,11 @@ protected void SendToServer<T>(string messageType, string channelName, T instanc
956961
/// <param name="data">The binary data to send</param>
957962
protected void SendToServerTarget(string messageType, string channelName, byte[] data)
958963
{
964+
if (!MessageManager.messageTypes.ContainsKey(messageType))
965+
{
966+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
967+
return;
968+
}
959969
if (MessageManager.messageTypes[messageType] < 32)
960970
{
961971
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -989,6 +999,11 @@ protected void SendToServerTarget<T>(string messageType, string channelName, T i
989999
/// <param name="data">The binary data to send</param>
9901000
protected void SendToLocalClient(string messageType, string channelName, byte[] data)
9911001
{
1002+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1003+
{
1004+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1005+
return;
1006+
}
9921007
if (MessageManager.messageTypes[messageType] < 32)
9931008
{
9941009
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1022,6 +1037,11 @@ protected void SendToLocalClient<T>(string messageType, string channelName, T in
10221037
/// <param name="data">The binary data to send</param>
10231038
protected void SendToLocalClientTarget(string messageType, string channelName, byte[] data)
10241039
{
1040+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1041+
{
1042+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1043+
return;
1044+
}
10251045
if (MessageManager.messageTypes[messageType] < 32)
10261046
{
10271047
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1055,6 +1075,11 @@ protected void SendToLocalClientTarget<T>(string messageType, string channelName
10551075
/// <param name="data">The binary data to send</param>
10561076
protected void SendToNonLocalClients(string messageType, string channelName, byte[] data)
10571077
{
1078+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1079+
{
1080+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1081+
return;
1082+
}
10581083
if (MessageManager.messageTypes[messageType] < 32)
10591084
{
10601085
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1088,6 +1113,11 @@ protected void SendToNonLocalClients<T>(string messageType, string channelName,
10881113
/// <param name="data">The binary data to send</param>
10891114
protected void SendToNonLocalClientsTarget(string messageType, string channelName, byte[] data)
10901115
{
1116+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1117+
{
1118+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1119+
return;
1120+
}
10911121
if (MessageManager.messageTypes[messageType] < 32)
10921122
{
10931123
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1122,6 +1152,11 @@ protected void SendToNonLocalClientsTarget<T>(string messageType, string channel
11221152
/// <param name="data">The binary data to send</param>
11231153
protected void SendToClient(uint clientId, string messageType, string channelName, byte[] data)
11241154
{
1155+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1156+
{
1157+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1158+
return;
1159+
}
11251160
if (MessageManager.messageTypes[messageType] < 32)
11261161
{
11271162
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1157,6 +1192,11 @@ protected void SendToClient<T>(int clientId, string messageType, string channelN
11571192
/// <param name="data">The binary data to send</param>
11581193
protected void SendToClientTarget(uint clientId, string messageType, string channelName, byte[] data)
11591194
{
1195+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1196+
{
1197+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1198+
return;
1199+
}
11601200
if (MessageManager.messageTypes[messageType] < 32)
11611201
{
11621202
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1192,6 +1232,11 @@ protected void SendToClientTarget<T>(int clientId, string messageType, string ch
11921232
/// <param name="data">The binary data to send</param>
11931233
protected void SendToClients(uint[] clientIds, string messageType, string channelName, byte[] data)
11941234
{
1235+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1236+
{
1237+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1238+
return;
1239+
}
11951240
if (MessageManager.messageTypes[messageType] < 32)
11961241
{
11971242
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1227,6 +1272,11 @@ protected void SendToClients<T>(int[] clientIds, string messageType, string chan
12271272
/// <param name="data">The binary data to send</param>
12281273
protected void SendToClientsTarget(uint[] clientIds, string messageType, string channelName, byte[] data)
12291274
{
1275+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1276+
{
1277+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1278+
return;
1279+
}
12301280
if (MessageManager.messageTypes[messageType] < 32)
12311281
{
12321282
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1262,6 +1312,11 @@ protected void SendToClientsTarget<T>(int[] clientIds, string messageType, strin
12621312
/// <param name="data">The binary data to send</param>
12631313
protected void SendToClients(List<uint> clientIds, string messageType, string channelName, byte[] data)
12641314
{
1315+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1316+
{
1317+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1318+
return;
1319+
}
12651320
if (MessageManager.messageTypes[messageType] < 32)
12661321
{
12671322
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1297,6 +1352,11 @@ protected void SendToClients<T>(List<int> clientIds, string messageType, string
12971352
/// <param name="data">The binary data to send</param>
12981353
protected void SendToClientsTarget(List<uint> clientIds, string messageType, string channelName, byte[] data)
12991354
{
1355+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1356+
{
1357+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1358+
return;
1359+
}
13001360
if (MessageManager.messageTypes[messageType] < 32)
13011361
{
13021362
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1331,6 +1391,11 @@ protected void SendToClientsTarget<T>(List<uint> clientIds, string messageType,
13311391
/// <param name="data">The binary data to send</param>
13321392
protected void SendToClients(string messageType, string channelName, byte[] data)
13331393
{
1394+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1395+
{
1396+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1397+
return;
1398+
}
13341399
if (MessageManager.messageTypes[messageType] < 32)
13351400
{
13361401
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");
@@ -1364,6 +1429,11 @@ protected void SendToClients<T>(string messageType, string channelName, T instan
13641429
/// <param name="data">The binary data to send</param>
13651430
protected void SendToClientsTarget(string messageType, string channelName, byte[] data)
13661431
{
1432+
if (!MessageManager.messageTypes.ContainsKey(messageType))
1433+
{
1434+
Debug.LogWarning("MLAPI: Invalid message type \"" + channelName + "\"");
1435+
return;
1436+
}
13671437
if (MessageManager.messageTypes[messageType] < 32)
13681438
{
13691439
Debug.LogWarning("MLAPI: Sending messages on the internal MLAPI channels is not allowed!");

0 commit comments

Comments
 (0)