gg.easy.airship 0.1.2159 → 0.1.2161

package/Editor/Accessories/AccessoryCollectionEditorTools.cs

@@ -132,6 +132,7 @@ public class AccessoryCollectionTools {
     // }
 
 
+#if AIRSHIP_INTERNAL
     [MenuItem("Airship/Avatar/Create Outfit Accessories from Mesh %f8", true)]
     [MenuItem("Assets/Create/Airship/Accessories/Create Outfit Accessories from Mesh", true)]
     private static bool ValidateCreateAccFromMesh(){
@@ -159,14 +160,16 @@ public class AccessoryCollectionTools {
         return Selection.GetFiltered<GameObject>(AssetModeMask).Length == 1;
     }
 
-    [MenuItem("Airship/Avatar/Create Accessory from Mesh %f8")]
-    [MenuItem("Assets/Create/Airship/Accessories/Create Accessory from Mesh")]
+    [MenuItem("Airship/Avatar/Create Accessory from Mesh %f8", false, 100)]
+    [MenuItem("Assets/Create/Airship/Accessories/Create Accessory from Mesh", false, 100)]
     static void CreateSingleAccFromMesh() {
         processedPaths.Clear();
         // defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials//MaterialLibrary/Organic/Clay.mat");
         UnpackSingleObject(Selection.GetFiltered<GameObject>(AssetModeMask)[0]);
     }
 
+#endif
+
     private static void UnpackSingleObject(GameObject rootGo){
         string rootPath = AssetDatabase.GetAssetPath(rootGo.GetInstanceID());
         string fileName = Path.GetFileNameWithoutExtension(rootPath);

package/Editor/BuildMenu.cs

@@ -67,6 +67,8 @@ namespace Editor {
 
             FileUtil.DeleteFileOrDirectory("build/StandaloneLinux64");
 
+            // This should probably be NamedBuildTarget.Server (rather than Standalone), but that does cause some issues.
+            // We will want to review this again in the future as a possible optimization.
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.IL2CPP);
             PlayerSettings.dedicatedServerOptimizations = true;
             PlayerSettings.insecureHttpOption = InsecureHttpOption.AlwaysAllowed;
@@ -194,7 +196,7 @@ namespace Editor {
 
             UserBuildSettings.architecture = OSArchitecture.x64ARM64;
             PlayerSettings.SplashScreen.show = false;
-            PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.IL2CPP);
+            PlayerSettings.SetScriptingBackend(NamedBuildTarget.iOS, ScriptingImplementation.IL2CPP);
             var options = new BuildPlayerOptions();
             options.scenes = scenes;
             options.locationPathName = "build/client_ios";

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -238,7 +238,7 @@ namespace Editor.Packages {
                 var style = new GUIStyle(EditorStyles.textField);
                 
                 this.addPackageId = EditorGUILayout.TextField("Package ID", this.addPackageId);
-                EditorGUILayout.LabelField("Example: @Easy/Survival");
+                EditorGUILayout.LabelField("Example: @Easy/VoxelWorld");
                 EditorGUILayout.Space(4);
 
                 var addPackagePressed = GUILayout.Button("Add Package", GUILayout.Width(150));
@@ -288,7 +288,7 @@ namespace Editor.Packages {
                 EditorGUILayout.Space(12);
                 EditorGUILayout.BeginVertical();
                 this.createPackageId = EditorGUILayout.TextField("Package ID", this.createPackageId);
-                EditorGUILayout.LabelField("Example: @Easy/Survival");
+                EditorGUILayout.LabelField("Example: @Easy/VoxelWorld");
                 EditorGUILayout.Space(4);
                 if (GUILayout.Button("Create Package", GUILayout.Width(150))) {
                     EditorCoroutineUtility.StartCoroutineOwnerless(CreateNewLocalSourcePackage(this.createPackageId));

package/Editor/Tools/Characters/AirshipCharacterEditor.cs

@@ -18,7 +18,7 @@ public class AirshipCharacterEditor : MonoBehaviour {
         }
     }
 
-    [MenuItem("Assets/Create/Airship/Viewmodel Variant", false, 1)]
+    [MenuItem("Assets/Create/Airship/Viewmodel Variant", false, -104)]
     static void CreateViewmodelVariant() {
         GameObject source =
             AssetDatabase.LoadAssetAtPath<GameObject>(
@@ -29,7 +29,7 @@ public class AirshipCharacterEditor : MonoBehaviour {
         Selection.activeObject = prefab;
     }
 
-    [MenuItem("Assets/Create/Airship/Character Variant", false, 1)]
+    [MenuItem("Assets/Create/Airship/Character Variant", false, -105)]
     static void CreateCharacterVariant() {
         GameObject source =
             AssetDatabase.LoadAssetAtPath<GameObject>(

package/Editor/TypescriptServices/Compiler/TypescriptCompilerWatchState.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
+using UnityEditor;
 using UnityEngine;
 using Debug = UnityEngine.Debug;
 
@@ -65,10 +67,16 @@ namespace Airship.Editor {
             var fullCommandString = string.Join(" ", argList);
             
             TypescriptLogService.Log(TypescriptLogLevel.Information, $"Start process 'node {fullCommandString}'");
-            var compilerProcess = TypescriptCompilationService.RunNodeCommand(directory, fullCommandString);
-            
-            TypescriptCompilationService.AttachWatchOutputToUnityConsole(this, arguments, compilerProcess);
-            processId = compilerProcess.Id;
+
+            try {
+                var compilerProcess = TypescriptCompilationService.RunNodeCommand(directory, fullCommandString);
+                TypescriptCompilationService.AttachWatchOutputToUnityConsole(this, arguments, compilerProcess);
+                processId = compilerProcess.Id;
+            }
+            catch (Win32Exception _) {
+                EditorUtility.DisplayDialog("Failed to initialize TypeScript",
+                    "Ensure you have the latest LTS node.js installed, then restart the editor and Unity Hub", "Ok");
+            }
             
             TypescriptCompilationServicesState.instance.RegisterWatchCompiler(this);
             yield return null;

package/Editor/TypescriptServices/Editor/AirshipScriptEditorIntegrations.cs

@@ -11,7 +11,7 @@ namespace Airship.Editor {
         internal static string AirshipComponentTemplate => PosixPath.Join(TemplatePath, "AirshipComponent.ts.txt");
         internal static string AirshipModuleTemplate => PosixPath.Join(TemplatePath, "AirshipModule.ts.txt");
 
-        [MenuItem("Assets/Create/Airship/TypeScript File", false, 2)]
+        [MenuItem("Assets/Create/Airship/TypeScript File", false, 50)]
         private static void CreateNewComponentFile()
         {
             ProjectWindowUtil.CreateScriptAssetFromTemplateFile(AirshipComponentTemplate, "AirshipComponent.ts");

package/Runtime/Code/Auth/Socket/SocketManager.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Airship.DevConsole;
 using Code.Auth;
 using Code.Http.Internal;
 using Code.Platform.Shared;
@@ -48,6 +49,21 @@ public class SocketManager : Singleton<SocketManager> {
         DontDestroyOnLoad(this);
     }
 
+    private void Start() {
+        DevConsole.AddCommand(Command.Create<string>("join", "", "Join a game from given gameId",
+            Parameter.Create("gameId", "Game ID of the target game."), async (gameId) => {
+                Debug.Log("Requesting transfer to game " + gameId + " ...");
+                var packet = $"{{\"gameId\": \"{gameId}\"}}";
+                var res = await InternalHttpManager.PostAsync(AirshipPlatformUrl.gameCoordinator + "/transfers/transfer/self", packet);
+                if (res.success) {
+                    Debug.Log("<color=green>Joining...</color>");
+                }
+                else {
+                    Debug.LogError("Failed to join game: " + res.error);
+                }
+            }));
+    }
+
     public static async Task<bool> ConnectAsyncInternal() {
         // print("Connecting to socket with auth token: " + authToken);
         if (Instance.socket == null) {

package/Runtime/Code/Authentication/EasyAuthenticator.cs

@@ -20,6 +20,8 @@ namespace Code.Authentication {
         public string editorUserId;
         public string editorUsername;
         public string editorProfileImageId;
+
+        public string passkey;
     }
     public struct LoginResponseMessage : NetworkMessage
     {
@@ -32,11 +34,24 @@ namespace Code.Authentication {
         public string reason;
     }
 
+    public struct ServerStartupFailureMessage : NetworkMessage {
+        public string reason;
+    }
+
     public class EasyAuthenticator : NetworkAuthenticator {
+        private string passkey = "empty";
+        
         readonly HashSet<NetworkConnection> connectionsPendingDisconnect = new HashSet<NetworkConnection>();
 
         public int connectionCounter = 0;
 
+        private void Awake() {
+            TextAsset passkeyTextFile = Resources.Load<TextAsset>("ConnectPassKey");
+            if (passkeyTextFile) {
+                this.passkey = passkeyTextFile.text;
+            }
+        }
+
         public override void OnStartServer() {
             this.connectionCounter = 0;
 
@@ -46,6 +61,7 @@ namespace Code.Authentication {
 
         public override async void OnStartClient() {
             NetworkClient.RegisterHandler<KickMessage>(Client_OnKickBroadcast, false);
+            NetworkClient.RegisterHandler<ServerStartupFailureMessage>(Client_OnServerStartupFailure, false);
 
             //Listen to response from server.
             NetworkClient.RegisterHandler<LoginResponseMessage>(Client_OnLoginResponseMessage, false);
@@ -53,6 +69,7 @@ namespace Code.Authentication {
 
         public override void OnStopClient() {
             NetworkClient.UnregisterHandler<KickMessage>();
+            NetworkClient.UnregisterHandler<ServerStartupFailureMessage>();
             NetworkClient.UnregisterHandler<LoginResponseMessage>();
         }
 
@@ -72,6 +89,7 @@ namespace Code.Authentication {
                         editorUserId = EditorAuthManager.localUser.uid,
                         editorUsername = EditorAuthManager.localUser.username,
                         editorProfileImageId = EditorAuthManager.localUser.profileImageId,
+                        passkey = this.passkey,
                     });
                     return;
                 }
@@ -91,6 +109,7 @@ namespace Code.Authentication {
                         NetworkClient.Send(new LoginMessage {
                             authToken = authToken,
                             playerVersion = AirshipConst.playerVersion,
+                            passkey = this.passkey,
                         });
                         return;
                     }
@@ -100,6 +119,7 @@ namespace Code.Authentication {
             NetworkClient.Send(new LoginMessage {
                 authToken = authToken,
                 playerVersion = AirshipConst.playerVersion,
+                passkey = this.passkey,
             });
         }
 
@@ -107,6 +127,10 @@ namespace Code.Authentication {
             TransferManager.Instance.Disconnect(true, kickMessage.reason);
         }
 
+        private void Client_OnServerStartupFailure(ServerStartupFailureMessage message) {
+            TransferManager.Instance.Disconnect(true, message.reason);
+        }
+
         /// <summary>
         /// Received on server when a client sends the password broadcast message.
         /// </summary>
@@ -115,6 +139,11 @@ namespace Code.Authentication {
         private async void Server_OnLoginMessage(NetworkConnectionToClient conn, LoginMessage loginData) {
             if (connectionsPendingDisconnect.Contains(conn)) return;
 
+            if (loginData.passkey != this.passkey) {
+                this.RejectConnection(conn, "Invalid passkey.",  true);
+                return;
+            }
+
 #if UNITY_SERVER
             Debug.Log("Authenticating " + conn);
 #endif
@@ -171,10 +200,11 @@ namespace Code.Authentication {
             if (Application.isEditor && CrossSceneState.IsLocalServer()) {
                 this.connectionCounter++;
                 if (this.connectionCounter == 1 && loginMessage.editorUserId != null) {
+                    string userId = InternalHttpManager.editorUserId ?? (this.connectionCounter + "");
                     tcs.SetResult(new UserData() {
-                        uid = InternalHttpManager.editorUserId,
+                        uid = userId,
                         username = loginMessage.editorUsername,
-                        orgRoleName = "Dev",
+                        orgRoleName = "Owner",
                         profileImageId = loginMessage.editorProfileImageId,
                     });
                     return await tcs.Task;
@@ -182,7 +212,7 @@ namespace Code.Authentication {
                 tcs.SetResult(new UserData() {
                     uid = this.connectionCounter + "",
                     username = "Player" + this.connectionCounter,
-                    orgRoleName = "Dev",
+                    orgRoleName = "Owner",
                     profileImageId = string.Empty,
                     fullTransferPacket = "{}"
                 });

package/Runtime/Code/Bootstrap/BundleDownloader.cs

@@ -220,11 +220,8 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				}
 
 				if (!success && RunCore.IsServer()) {
-					var serverBootstrap = FindAnyObjectByType<ServerBootstrap>();
-					if (serverBootstrap.IsAgonesEnvironment()) {
-						Debug.LogError("[SEVERE] Server failed to download bundles. Shutting down!");
-						serverBootstrap.agones.Shutdown().Wait();
-					}
+					onComplete?.Invoke(false);
+					return false;
 				}
 
 				if (!success && RunCore.IsClient()) {
@@ -268,12 +265,10 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 					if (loadingScreen) {
 						loadingScreen.SetError("Failed to download Main Menu scripts.");
 					}
-					if (RunCore.IsServer()) {
-						var serverBootstrap = FindAnyObjectByType<ServerBootstrap>();
-						if (serverBootstrap.IsAgonesEnvironment()) {
-							Debug.LogError("[SEVERE] Server failed to download code.zip. Shutting down!");
-							serverBootstrap.agones.Shutdown().Wait();
-						}
+					if (RunCore.IsServer())
+					{
+						onComplete?.Invoke(false);
+						return false;
 					}
 				} else {
 					File.WriteAllText(Path.Join(package.GetPersistentDataDirectory(), "code_version_" + package.codeVersion + ".txt"), "success");

package/Runtime/Code/Bootstrap/ServerBootstrap.cs

@@ -7,6 +7,7 @@ using System.Runtime.Serialization;
 using Agones;
 using Agones.Model;
 using Code.Analytics;
+using Code.Authentication;
 using Code.Bootstrap;
 using Code.GameBundle;
 using Code.Http.Internal;
@@ -286,6 +287,7 @@ public class ServerBootstrap : MonoBehaviour
 			}
 			this.airshipJWT = annotations["JWT"];
 			UnityWebRequestProxyHelper.ProxyAuthCredentials = this.airshipJWT;
+			InternalHttpManager.authTokenSetTaskCompletionSource.SetResult(true);
 			// Debug.Log("Airship JWT:");
 			// Debug.Log(airshipJWT);
 
@@ -428,7 +430,15 @@ public class ServerBootstrap : MonoBehaviour
 		if (!RunCore.IsEditor()) {
 			BundleDownloader.Instance.DownloadBundles(startupConfig.CdnUrl, packages.ToArray(), privateBundleFiles, null, gameCodeZipUrl, false,
 				(res) => {
-					downloadComplete = true;
+					if (!res)
+					{
+						Debug.LogWarning("[Airship]: Failed to download required files. See above logs for details. Shutting down server.");
+						ShutdownDueToAssetFailure(1);
+					}
+					else
+					{
+						downloadComplete = true;
+					}
 				});
 		} else {
 			downloadComplete = true;
@@ -476,13 +486,34 @@ public class ServerBootstrap : MonoBehaviour
         isServerReady = true;
         OnServerReady?.Invoke();
 	}
-
-	public void Shutdown() {
+	
+	private void ShutdownInternal(int exitCode = 0) {
 		if (agones && !this.isAgonesShutdownTriggered) {
 			this.isAgonesShutdownTriggered = true;
 			agones.Shutdown();
-			Application.Quit();
+			Application.Quit(exitCode);
+		}
+	}
+
+	private void ShutdownDueToAssetFailure(int exitCode = 1) {
+		if (NetworkServer.connections != null && NetworkServer.connections.Count > 0) {
+			var message = new ServerStartupFailureMessage {
+				reason = "Server failed to download required game assets.\n\nIf you are the game developer, ensure your game / packages have all been properly published.\n\nCheck the error console in the Airship Create portal for more details.",
+			};
+			
+			foreach (var connection in NetworkServer.connections.Values) {
+				if (connection != null) {
+					connection.Send(message);
+				}
+			}
 		}
+
+		ShutdownInternal(exitCode);
+	}
+
+	public void Shutdown()
+	{
+		ShutdownInternal(0);
 	}
 
 	/**

package/Runtime/Code/Bootstrap/SignalHandler.cs

@@ -43,4 +43,4 @@ namespace Code.Bootstrap {
         }
 #endif
     }
-}
+}

package/Runtime/Code/Health/AirshipProfileExporter.cs

@@ -88,33 +88,49 @@ namespace Code.Health
                 NetworkClient.RegisterHandler<ClientProfileUploadResponse>(OnClientUploadResponse);
             }
 
-            DevConsole.AddCommand(Command.Create<string, int, bool>(
-                "profile", 
+            // Profile without callstacks
+            DevConsole.AddCommand(Command.Create<string, int>(
+                "profile",
                 "",
-                "Starts and uploads a profile. Once complete the download link will be printed.", 
-                    Parameter.Create("Context", "Options: Server | Client"),
+                "Starts and uploads a profile. Once complete the download link will be printed.",
+                Parameter.Create("Context", "Options: Server | Client"),
                 Parameter.Create("Duration", "Duration of profile in seconds (max 5s)"),
-                Parameter.Create("Callstacks", "Enable callstacks for profile (this is laggy)"), 
-                (context, d, callstacks) => {
-                    if (d is < 0 or > 5) {
-                        Debug.LogError("You can only profile for a max of 5s.");
-                        return;
-                    }
+                (context, d) => {
+                    OnProfileCommand(context, d, false);
+                }
+            ));
 
-                    if (context.Equals("client", StringComparison.OrdinalIgnoreCase)) {
-                        if (!Debug.isDebugBuild) {
-                            Debug.Log(
-                                "Unable to capture profile log because debug mode is not enabled. Use the development build branch on Steam to enable debug mode.");
-                            return;
-                        }
-                        StartProfiling(d, null, callstacks);
-                    } else if (context.Equals("server", StringComparison.OrdinalIgnoreCase)) {
-                        Debug.Log("Starting a server profile, view server console to monitor progress.");
-                        NetworkClient.Send(new StartServerProfileMessage { DurationSecs = d, CallstacksEnabled = callstacks });
-                    }
+            // Deep profile with callstacks
+            DevConsole.AddCommand(Command.Create<string, int>(
+                "deepprofile", 
+                "",
+                "Starts and uploads a profile with callstacks. Once complete the download link will be printed.",
+                    Parameter.Create("Context", "Options: Server | Client"),
+                Parameter.Create("Duration", "Duration of profile in seconds (max 5s)"),
+                (context, d) => {
+                    OnProfileCommand(context, d, true);
                 }));
         }
 
+        private void OnProfileCommand(string context, int dur, bool callstacks) {
+            if (dur is < 0 or > 5) {
+                Debug.LogError("You can only profile for a max of 5s.");
+                return;
+            }
+
+            if (context.Equals("client", StringComparison.OrdinalIgnoreCase)) {
+                if (!Debug.isDebugBuild) {
+                    Debug.Log(
+                        "Unable to capture profile log because debug mode is not enabled. Use the development build branch on Steam to enable debug mode.");
+                    return;
+                }
+                StartProfiling(dur, null, callstacks);
+            } else if (context.Equals("server", StringComparison.OrdinalIgnoreCase)) {
+                Debug.Log("Starting a server profile, view server console to monitor progress.");
+                NetworkClient.Send(new StartServerProfileMessage { DurationSecs = dur, CallstacksEnabled = callstacks });
+            }
+        }
+
         private void Update() {
             if (Profiler.enabled != lastProfilerEnabled) {
                 lastProfilerEnabled = Profiler.enabled;
@@ -167,12 +183,6 @@ namespace Code.Health
         }
 
         public void StartProfiling(int durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator, bool enableCallstacks) {
-            // TODO check that sender is game dev
-            // if (Profiler.enabled) {
-            //     Debug.LogWarning("Profiler is already running.");
-            //     return;
-            // }
-
             var date = DateTime.Now.ToString("MM-dd-yyyy h.mm.ss");
             var fileName = RunCore.IsClient() ?  $"Client-Profile-{date}.raw" :  $"Server-Profile-{date}.raw";
             if (!Directory.Exists(Path.Combine(Application.persistentDataPath, "ClientProfiles"))) {
@@ -193,6 +203,7 @@ namespace Code.Health
         private async void StopProfilingAfterDelay(string logPath, string fileName, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
             await Task.Delay((int)(durationSecs * 1000));
             Profiler.enabled = false;
+            Profiler.enableBinaryLog = false;
             Profiler.enableAllocationCallstacks = false;
             var info = new FileInfo(logPath);
 

package/Runtime/Code/Http/Internal/InternalHttpManager.cs

@@ -13,10 +13,13 @@ namespace Code.Http.Internal {
         public static string editorUserId;
         public static string editorAuthToken = "";
         public static string authToken = "";
-        private static TaskCompletionSource<bool> authTokenSetTaskCompletionSource = new();
+        public static TaskCompletionSource<bool> authTokenSetTaskCompletionSource = new();
 
-        static InternalHttpManager() {
-            if (RunCore.IsServer()) {
+        // This handles the case when we are a server in editor dedicated mode.
+        // In this case, we immediately resolve the task because we will not have any auth token.
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        public static void OnLoad() {
+            if (RunCore.IsServer() && !RunCore.IsClient() && RunCore.IsEditor()) {
                 authTokenSetTaskCompletionSource.TrySetResult(true);
             }
         }
@@ -27,7 +30,7 @@ namespace Code.Http.Internal {
                 return HttpManager.GetAsync(url, GetHeaders());
             }
 #endif
-            
+
             return authTokenSetTaskCompletionSource.Task.ContinueWith(_ => {
                 return HttpManager.GetAsync(url, GetHeaders());
             }, TaskScheduler.FromCurrentSynchronizationContext()).Unwrap();

package/Runtime/Code/Luau/AirshipComponent.cs

@@ -180,7 +180,14 @@ public class AirshipComponent : MonoBehaviour, ITriggerReceiver {
 			script = runtimeScript;
 		}
 		else {
-			Debug.LogError($"Failed to find code.zip compiled script. Path: {script.m_path.ToLower()}, GameObject: {gameObject.name}", gameObject);
+			var isPackage = scriptPath.StartsWith("Assets/AirshipPackage");
+			if (script == null) {
+				var suggestion = isPackage ? "have you published this package?" : "have you done a full publish of this game?";
+				Debug.LogError($"Could not find compiled script from asset bundle '{scriptPath}' for GameObject {gameObject.name} (Missing Script Asset) - {suggestion}", gameObject);
+			}
+			else {
+				Debug.LogError($"Could not find compiled script in code archive '{script.m_path.ToLower()}' for GameObject {gameObject.name} (Missing Runtime Script Code)", gameObject);
+			}
 			return;
 		}
 #endif

package/Runtime/Code/Player/PlayerInfo.cs

@@ -11,6 +11,7 @@ public class PlayerInfoDto {
 	public string username;
 	public string profileImageId;
 	public string orgRoleName;
+	public string transferPacket;
 	public GameObject gameObject;
 }
 
@@ -21,6 +22,7 @@ public class PlayerInfo : NetworkBehaviour {
 	[SyncVar] public int connectionId;
 	[SyncVar] public string profileImageId;
 	[SyncVar] public string orgRoleName;
+	public string transferPacket;
 	public AudioSource voiceChatAudioSource;
 
 	private void Start() {
@@ -28,13 +30,14 @@ public class PlayerInfo : NetworkBehaviour {
 		PlayerManagerBridge.Instance.AddPlayer(this);
 	}
 
-	public void Init(int connectionId, string userId, string username, string profileImageId, string orgRoleName) {
+	public void Init(int connectionId, string userId, string username, string profileImageId, string orgRoleName, string transferPacket) {
 		this.gameObject.name = "Player_" + username;
 		this.connectionId = connectionId;
 		this.userId = userId;
 		this.username = username;
 		this.profileImageId = profileImageId;
 		this.orgRoleName = orgRoleName;
+		this.transferPacket = transferPacket;
 		
 		this.InitVoiceChat();
 	}
@@ -82,6 +85,7 @@ public class PlayerInfo : NetworkBehaviour {
 			username = this.username,
 			profileImageId = this.profileImageId,
 			orgRoleName = this.orgRoleName,
+			transferPacket = this.transferPacket,
 			gameObject = this.gameObject,
 		};
 	}

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -176,7 +176,7 @@ namespace Code.Player {
 			var go = Instantiate(this.playerPrefab, Instance.transform.parent);
 
 			var playerInfo = go.GetComponent<PlayerInfo>();
-			playerInfo.Init(connectionId, userId, username, profilePictureId, string.Empty);
+			playerInfo.Init(connectionId, userId, username, profilePictureId, string.Empty, string.Empty);
 
 			// var identity = go.GetComponent<NetworkIdentity>();
 			NetworkServer.Spawn(go);
@@ -217,7 +217,7 @@ namespace Code.Player {
 // #if UNITY_SERVER || true
 // 				Debug.Log($"Initializing Player as {userData.username} owned by " + conn);
 // #endif
-				playerInfo.Init(conn.connectionId, userData.uid, userData.username, userData.profileImageId, userData.orgRoleName);
+				playerInfo.Init(conn.connectionId, userData.uid, userData.username, userData.profileImageId, userData.orgRoleName, userData.fullTransferPacket);
 			} else {
 #if UNITY_SERVER || true
 				Debug.Log("Missing UserData for " + conn);

package/Runtime/Code/Util/Singleton.cs

@@ -34,8 +34,7 @@ public abstract class Singleton<T> : MonoBehaviour where T : MonoBehaviour
 					go.name = typeof(T).ToString();
 					
 					var coreScene = SceneManager.GetSceneByName("CoreScene");
-					// if (!coreScene.isLoaded) return null;
-					if (coreScene.IsValid()) {
+					if (coreScene.IsValid() && coreScene.isLoaded) {
 						SceneManager.MoveGameObjectToScene(go, coreScene);
 					}
 

package/Runtime/Code/VoxelWorld/Editor/VoxelBuilderEditorWindow.cs

@@ -131,7 +131,6 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
                 //Select this
                 selection.gameObject.SetActive(true);
                 Selection.activeGameObject = selection.gameObject;
-                Debug.Log("select.1");
             }
 
             if (VoxelWorldEditorToolBase.buttonActive) {
@@ -141,7 +140,6 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
                 if (selection) {
                     //Select the world
                     Selection.activeGameObject = world.gameObject;
-                    Debug.Log("select.2");
                     //disable it
                     selection.gameObject.SetActive(false);