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: #3262 allow running a mirror project from edit prefab mode again (#3924)

Browse Source 
Co-authored-by: mischa <info@noobtuts.com>
This commit is contained in:
mischa 2024-10-28 23:13:23 +01:00 committed by GitHub
parent 68c7d14a16
commit c80a3c8ea5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Assets/Mirror/Editor/NetworkScenePostProcess.cs
View File

@ -55,19 +55,28 @@ public static void OnPostProcessScene()
else else
{ {
// there are two cases where sceneId == 0: // there are two cases where sceneId == 0:
// * if we have a prefab open in the prefab scene // if we have a prefab open in the prefab scene
// * if an unopened scene needs resaving
// show a proper error message in both cases so the user
// knows what to do.
string path = identity.gameObject.scene.path; string path = identity.gameObject.scene.path;
if (string.IsNullOrWhiteSpace(path)) if (string.IsNullOrWhiteSpace(path))
{
// pressing play while in prefab edit mode used to freeze/crash Unity 2019.
// this seems fine now so we don't need to stop the editor anymore.
#if UNITY_2020_3_OR_NEWER
Debug.LogWarning($"{identity.name} was open in Prefab Edit Mode while launching with Mirror. If this causes issues, please let us know.");
#else
Debug.LogError($"{identity.name} is currently open in Prefab Edit Mode. Please open the actual scene before launching Mirror."); Debug.LogError($"{identity.name} is currently open in Prefab Edit Mode. Please open the actual scene before launching Mirror.");
EditorApplication.isPlaying = false;
#endif
}
// if an unopened scene needs resaving
else else
Debug.LogError($"Scene {path} needs to be opened and resaved, because the scene object {identity.name} has no valid sceneId yet."); {
// either way we shouldn't continue. nothing good will // nothing good will happen when trying to launch with invalid sceneIds.
// happen when trying to launch with invalid sceneIds. // show an error and stop playing immediately.
EditorApplication.isPlaying = false; Debug.LogError($"Scene {path} needs to be opened and resaved, because the scene object {identity.name} has no valid sceneId yet.");
EditorApplication.isPlaying = false;
}
} }
} }
} }