From 890fa065e7481e7b1b8548cb21b587fe4b5d0d25 Mon Sep 17 00:00:00 2001 From: Pietrodjaowjao Date: Wed, 28 Oct 2026 20:49:29 -0300 Subject: [PATCH] use InstanceExists instead --- MiraAPI/Roles/CustomRoleManager.cs | 2 +- MiraAPI/Roles/CustomRoleUtils.cs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs index 314f2589..d89e40a9 100644 --- a/MiraAPI/Roles/CustomRoleManager.cs +++ b/MiraAPI/Roles/CustomRoleManager.cs @@ -38,7 +38,7 @@ public static class CustomRoleManager /// /// Gets the array of all roles from vanilla . /// - public static RoleBehaviour[] AllRoles => RoleManager.Instance.AllRoles.ToArray(); + public static RoleBehaviour[] AllRoles => RoleManager.InstanceExists ? RoleManager.Instance.AllRoles.ToArray() : []; /// /// Gets the of custom roles as objects. diff --git a/MiraAPI/Roles/CustomRoleUtils.cs b/MiraAPI/Roles/CustomRoleUtils.cs index c5b1feb3..3e5a03c8 100644 --- a/MiraAPI/Roles/CustomRoleUtils.cs +++ b/MiraAPI/Roles/CustomRoleUtils.cs @@ -136,7 +136,12 @@ public static class CustomRoleUtils public static LoadableAsset? GetIntroSound(RoleTypes roleType) { var role = CustomRoleManager.AllRoles.FirstOrDefault(role => role.Role == roleType); - return role is ICustomRole customRole ? customRole.Configuration.IntroSound : new PreloadedAsset(role!.IntroSound); + if (role == null) + { + return null; + } + + return role is ICustomRole customRole ? customRole.Configuration.IntroSound : new PreloadedAsset(role.IntroSound); } ///