Fix NRE in catch statement...

Xilophor · Jun 15, 2024 · fc0cf98 · fc0cf98
1 parent 86cbfee
commit fc0cf98
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/LethalNetworkAPI/LethalNetwork.cs b/LethalNetworkAPI/LethalNetwork.cs
@@ -20,35 +20,35 @@ public abstract class LethalNetwork
 
     internal readonly string Identifier = null!;
     private readonly string _networkType = null!;
-    
+
     protected LethalNetwork(string identifier, string networkType, int frameIndex = 3)
     {
         try
         {
             var m = new StackTrace().GetFrame(frameIndex).GetMethod();
             var assembly = m.ReflectedType!.Assembly;
             var pluginType = AccessTools.GetTypesFromAssembly(assembly).First(type => type.GetCustomAttributes(typeof(BepInPlugin), false).Any());
-            
+
             Identifier = $"{MetadataHelper.GetMetadata(pluginType).GUID}.{identifier}";
             _networkType = networkType;
-        
+
 #if DEBUG
             LethalNetworkAPIPlugin.Logger.LogDebug($"LethalNetwork {_networkType} with identifier \"{Identifier}\" has been created.");
 #endif
         }
         catch (Exception e)
         {
-            LethalNetworkAPIPlugin.Logger.LogError(string.Format(TextDefinitions.UnableToFindGuid, _networkType.ToLower(), Identifier, e));
+            LethalNetworkAPIPlugin.Logger.LogError(string.Format(TextDefinitions.UnableToFindGuid, (_networkType ?? "").ToLower(), Identifier ?? "", e));
         }
     }
 
     #region Error Checks
-    
+
     /// <returns>true if it is null</returns>
     protected bool IsNetworkHandlerNull(bool log = true)
     {
         if (NetworkHandler.Instance != null) return false;
-        
+
         if (log) LethalNetworkAPIPlugin.Logger.LogError(string.Format(
             TextDefinitions.NotInLobbyEvent, _networkType.ToLower(), Identifier));
         return true;
@@ -59,34 +59,34 @@ protected bool IsHostOrServer(bool log = true)
     {
         if (NetworkManager.Singleton == null) return false;
         if (NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsServer) return true;
-        
+
         if (log) LethalNetworkAPIPlugin.Logger.LogError(string.Format(
             TextDefinitions.NotServerInfo, NetworkManager.Singleton.LocalClientId, _networkType, Identifier));
-        
+
         return false;
     }
 
     /// <returns>true if it exists</returns>
     private bool DoClientsExist(IEnumerable<ulong> clientIds, bool log = true)
     {
         if (clientIds.Any()) return true;
-        
+
         if (log) LethalNetworkAPIPlugin.Logger.LogError(string.Format(
             TextDefinitions.TargetClientsNotConnected, clientIds, _networkType, Identifier));
-        
+
         return false;
     }
 
     #endregion
 
     #region ClientRpcParams
-    
+
     private ClientRpcParams GenerateClientParams(IEnumerable<ulong> clientIds, bool allExcept)
     {
         NativeArray<ulong> allowedClientIds;
 
         var enumerable = clientIds as ulong[] ?? clientIds.ToArray();
-        
+
         if (!enumerable.Any() && allExcept)
             allowedClientIds = new NativeArray<ulong>(NetworkManager.Singleton.ConnectedClientsIds
                 .Where(i => i != NetworkManager.ServerClientId).ToArray(), Allocator.Persistent);
@@ -98,7 +98,7 @@ private ClientRpcParams GenerateClientParams(IEnumerable<ulong> clientIds, bool
                 .Where(i => NetworkManager.Singleton.ConnectedClientsIds.Contains(i)).ToArray(), Allocator.Persistent);
 
         if (!DoClientsExist(allowedClientIds)) return new ClientRpcParams();
-        
+
         return new ClientRpcParams
         {
             Send = new ClientRpcSendParams
@@ -107,14 +107,14 @@ private ClientRpcParams GenerateClientParams(IEnumerable<ulong> clientIds, bool
             }
         };
     }
-    
+
     protected ClientRpcParams GenerateClientParams(IEnumerable<ulong> clientIds) => GenerateClientParams(clientIds, false);
     protected ClientRpcParams GenerateClientParams(ulong clientId) => GenerateClientParams([clientId], false);
-    
+
     protected ClientRpcParams GenerateClientParamsExcept(IEnumerable<ulong> clientIds) => GenerateClientParams(clientIds, true);
     protected ClientRpcParams GenerateClientParamsExcept(ulong clientId) => GenerateClientParams([clientId], true);
-    
+
     protected ClientRpcParams GenerateClientParamsExceptHost() => GenerateClientParams([], true);
 
     #endregion
-}
+}