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

Changed NetworkingManager callbacks to be invoked on server and client

Browse Source
This commit is contained in:
Albin Corén 2018-03-28 22:50:54 +02:00
parent c46f268470
commit 6f2295bec1
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,8 +43,8 @@ namespace MLAPI
internal int serverClientId; internal int serverClientId;
public bool IsClientConnected; public bool IsClientConnected;
public Action OnClientConnectedCallback = null; public Action<int> OnClientConnectedCallback = null;
public Action OnClientDisconnectCallback = null; public Action<int> OnClientDisconnectCallback = null;
public Action OnServerStarted = null; public Action OnServerStarted = null;
public NetworkingConfiguration NetworkConfig; public NetworkingConfiguration NetworkConfig;
@ -352,11 +352,10 @@ namespace MLAPI
return; return;
} }
else else
{
if (OnClientDisconnectCallback != null)
OnClientDisconnectCallback.Invoke();
IsClientConnected = false; IsClientConnected = false;
}
if (OnClientDisconnectCallback != null)
OnClientDisconnectCallback.Invoke(clientId);
} }
else if (networkError != NetworkError.Ok) else if (networkError != NetworkError.Ok)
{ {
@ -400,12 +399,10 @@ namespace MLAPI
if (isServer) if (isServer)
OnClientDisconnect(clientId); OnClientDisconnect(clientId);
else else
{
if (OnClientDisconnectCallback != null)
OnClientDisconnectCallback.Invoke();
IsClientConnected = false; IsClientConnected = false;
}
if (OnClientDisconnectCallback != null)
OnClientDisconnectCallback.Invoke(clientId);
break; break;
} }
// Only do another iteration if: there are no more messages AND (there is no limit to max events or we have processed less than the maximum) // Only do another iteration if: there are no more messages AND (there is no limit to max events or we have processed less than the maximum)
@ -565,7 +562,6 @@ namespace MLAPI
case 1: //Server informs client it has been approved: case 1: //Server informs client it has been approved:
if (isClient) if (isClient)
{ {
//SceneManager.LoadScene(PlaySceneIndex);
using (MemoryStream messageReadStream = new MemoryStream(incommingData)) using (MemoryStream messageReadStream = new MemoryStream(incommingData))
{ {
using (BinaryReader messageReader = new BinaryReader(messageReadStream)) using (BinaryReader messageReader = new BinaryReader(messageReadStream))
@ -618,9 +614,9 @@ namespace MLAPI
} }
} }
} }
if (OnClientConnectedCallback != null)
OnClientConnectedCallback.Invoke();
IsClientConnected = true; IsClientConnected = true;
if (OnClientConnectedCallback != null)
OnClientConnectedCallback.Invoke(clientId);
} }
break; break;
case 2: case 2:
@ -1219,6 +1215,9 @@ namespace MLAPI
} }
} }
Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writeStream.GetBuffer(), null, true); Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writeStream.GetBuffer(), null, true);
if (OnClientConnectedCallback != null)
OnClientConnectedCallback.Invoke(clientId);
} }
//Inform old clients of the new player //Inform old clients of the new player