mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-01 03:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into unique-objectid

Browse Source 
# Conflicts:
#	QSB/Menus/MenuManager.cs
This commit is contained in:
JohnCorby 2021-12-12 01:56:57 -08:00
commit 89cc3d202d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/Menus/MenuManager.cs
View File

@ -176,7 +176,7 @@ namespace QSB.Menus
DisconnectButton = MenuApi.PauseMenu_MakeMenuOpenButton("DISCONNECT", DisconnectPopup);
QuitButton = FindObjectOfType<PauseMenuManager>()._exitToMainMenuAction.gameObject;
QuitButton = Locator.GetSceneMenuManager().pauseMenu._exitToMainMenuAction.gameObject;
if (QSBCore.IsInMultiplayer)
{

3
QuantumUNET/Components/QNetworkManager.cs
View File

@ -37,8 +37,6 @@ namespace QuantumUNET.Components
private static readonly QAddPlayerMessage s_AddPlayerMessage = new();
private static readonly QRemovePlayerMessage s_RemovePlayerMessage = new();
private static readonly QErrorMessage s_ErrorMessage = new();
private static AsyncOperation s_LoadingSceneAsync;
private static QNetworkConnection s_ClientReadyConnection;
private static string s_Address;
public bool customConfig { get; set; }
@ -373,7 +371,6 @@ namespace QuantumUNET.Components
{
if (!(singleton == null))
{
s_ClientReadyConnection = null;
singleton.StopHost();
singleton = null;
}