charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Edgegap Lobby Error continues to Connecting (#3898)

Browse Source 
Missing return, oops.
Also some minor readability cleanup
This commit is contained in:
Robin Rolf 2024-09-18 14:36:12 +01:00 committed by GitHub
parent 1cc18e67c5
commit 2d9ee5646c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Assets/Mirror/Transports/Edgegap/EdgegapLobby/EdgegapLobbyKcpTransport.cs
View File

@ -206,63 +206,66 @@ private IEnumerator WaitForLobbyRelay(string lobbyId, bool forServer)
Api.GetLobby(lobbyId, lobby => Api.GetLobby(lobbyId, lobby =>
{ {
waitingForResponse = false; waitingForResponse = false;
if (!string.IsNullOrEmpty(lobby.assignment.ip)) if (string.IsNullOrEmpty(lobby.assignment.ip))
{ {
relayAddress = lobby.assignment.ip; // no lobby deployed yet, have the outer loop retry
foreach (Lobby.Port aport in lobby.assignment.ports) return;
}
relayAddress = lobby.assignment.ip;
foreach (Lobby.Port aport in lobby.assignment.ports)
{
if (aport.protocol == "UDP")
{ {
if (aport.protocol == "UDP") if (aport.name == "server")
{ {
if (aport.name == "server") relayGameServerPort = (ushort)aport.port;
{
relayGameServerPort = (ushort)aport.port;
}
else if (aport.name == "client")
{
relayGameClientPort = (ushort)aport.port;
}
} }
} else if (aport.name == "client")
bool found = false;
foreach (Lobby.Player player in lobby.players)
{
if (player.id == _playerId)
{ {
userId = player.authorization_token; relayGameClientPort = (ushort)aport.port;
sessionId = lobby.assignment.authorization_token;
found = true;
break;
} }
} }
running = false; }
if (!found) bool found = false;
foreach (Lobby.Player player in lobby.players)
{
if (player.id == _playerId)
{ {
string errorMsg = $"Couldn't find my player ({_playerId})"; userId = player.authorization_token;
Debug.LogError(errorMsg); sessionId = lobby.assignment.authorization_token;
found = true;
break;
}
}
running = false;
if (!found)
{
string errorMsg = $"Couldn't find my player ({_playerId})";
Debug.LogError(errorMsg);
if (forServer)
{
_status = TransportStatus.Error;
OnServerError?.Invoke(0, TransportError.Unexpected, errorMsg);
ServerStop();
}
else
{
_status = TransportStatus.Error;
OnClientError?.Invoke(TransportError.Unexpected, errorMsg);
ClientDisconnect();
}
}
_status = TransportStatus.Connecting;
if (forServer) if (forServer)
{ {
base.ServerStart(); _status = TransportStatus.Error;
OnServerError?.Invoke(0, TransportError.Unexpected, errorMsg);
ServerStop();
} }
else else
{ {
base.ClientConnect(""); _status = TransportStatus.Error;
OnClientError?.Invoke(TransportError.Unexpected, errorMsg);
ClientDisconnect();
} }
return;
}
_status = TransportStatus.Connecting;
if (forServer)
{
base.ServerStart();
}
else
{
base.ClientConnect("");
} }
}, error => }, error =>
{ {