Merge branch 'develop' into feature/in-game-feed

Author: LPLafontaineB

Assets/BossRoom/Scripts/Client/UI/HeroActionBar.cs

@@ -197,6 +197,11 @@ void Update()
             // If we have another player selected, see if their aliveness state has changed,
             // and if so, update the interactiveness of the basic-action button
 
+            if (Input.GetKeyUp(KeyCode.Alpha4))
+            {
+                m_ButtonInfo[ActionButtonType.EmoteBar].Button.OnPointerUpEvent.Invoke();
+            }
+
             if (!m_SelectedPlayerNetState) { return; }
 
             bool isAliveNow = m_SelectedPlayerNetState.NetworkLifeState.LifeState.Value == LifeState.Alive;

Assets/BossRoom/Scripts/Shared/Net/UnityServices/Lobbies/LobbyAPIInterface.cs

@@ -115,7 +115,15 @@ public async Task<Lobby> QuickJoinLobby(string requesterUasId, Dictionary<string
 
         public async Task RemovePlayerFromLobby(string requesterUasId, string lobbyId)
         {
-           await ExceptionHandling(Lobbies.Instance.RemovePlayerAsync(lobbyId, requesterUasId));
+            try
+            {
+                await ExceptionHandling(Lobbies.Instance.RemovePlayerAsync(lobbyId, requesterUasId));
+            }
+            catch (LobbyServiceException e)
+                when (e is {Reason: LobbyExceptionReason.PlayerNotFound})
+            {
+                // If Player is not found, they have already left the lobby or have been kicked out. No need to throw here
+            }
         }
 
         public async Task<QueryResponse> QueryAllLobbies()

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/SessionManager.cs

@@ -142,7 +142,7 @@ public string GetPlayerId(ulong clientId)
                 return playerId;
             }
 
-            Debug.LogError($"No client player ID found mapped to the given client ID: {clientId}");
+            Debug.Log($"No client player ID found mapped to the given client ID: {clientId}");
             return null;
         }
 
@@ -160,7 +160,7 @@ public string GetPlayerId(ulong clientId)
                 return GetPlayerData(playerId);
             }
 
-            Debug.LogError($"No client player ID found mapped to the given client ID: {clientId}");
+            Debug.Log($"No client player ID found mapped to the given client ID: {clientId}");
             return null;
         }
 
@@ -176,7 +176,7 @@ public string GetPlayerId(ulong clientId)
                 return data;
             }
 
-            Debug.LogError($"No PlayerData of matching player ID found: {playerId}");
+            Debug.Log($"No PlayerData of matching player ID found: {playerId}");
             return null;
         }