Checking null values.

Braasileiro · Feb 8, 2024 · d09f5b4 · d09f5b4
1 parent 6b1ad4f
commit d09f5b4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/MDRPC/Models/ActivityModel.cs b/MDRPC/Models/ActivityModel.cs
@@ -55,8 +55,12 @@ public string GetLargeImageText()
     {
         if (!isPlaying)
             return $"{Global.MelonInfo.Name} {Global.MelonInfo.Version} • {playerName} (Lv. {playerLevel})";
-        return $"{playerName} (Lv. {playerLevel}) • {playerCharacter} feat. {playerElfin}";
-    }
+
+        if (playerElfin != null)
+            return $"{playerName} (Lv. {playerLevel}) • {playerCharacter} feat. {playerElfin}";
+
+        return $"{playerName} (Lv. {playerLevel}) • {playerCharacter}";
+	}
 
     public string GetSmallImage()
     {
@@ -71,4 +75,4 @@ public string GetSmallImageText()
             return string.Empty;
         return songLevel.GetDifficultyName();
     }
-}
+}
diff --git a/MDRPC/Models/CharacterModel.cs b/MDRPC/Models/CharacterModel.cs
@@ -20,9 +20,14 @@ public static string GetName()
             .GetLocal()
             .GetInfoByIndex(DataHelper.selectedRoleIndex);
 
-		if (CosCharacters.Contains(entity.characterName, StringComparer.OrdinalIgnoreCase))
-            return $"{entity.cosName} {entity.characterName}";
+        if (entity != null)
+        {
+			if (CosCharacters.Contains(entity.characterName, StringComparer.OrdinalIgnoreCase))
+				return $"{entity.cosName} {entity.characterName}";
 
-		return entity.characterName;
+			return entity.characterName;
+		}
+
+        return Constants.Discord.UnknownCharacter;
 	}
 }
diff --git a/MDRPC/Models/ElfinModel.cs b/MDRPC/Models/ElfinModel.cs
@@ -6,12 +6,16 @@ internal class ElfinModel
 {
     public static string GetName()
     {
-		return GlobalDataBase
+		var entity = GlobalDataBase
 			.dbConfig
 			.m_ConfigDic["elfin"]
 			.Cast<DBConfigElfin>()
 			.GetLocal()
-			.GetInfoByIndex(DataHelper.selectedElfinIndex)
-			.name;
+			.GetInfoByIndex(DataHelper.selectedElfinIndex);
+
+		if (entity != null)
+			return entity.name;
+
+		return null;
 	}
 }
diff --git a/MDRPC/Properties/Constants.cs b/MDRPC/Properties/Constants.cs
@@ -21,5 +21,6 @@ internal static class Discord
         // Unknown
         public const string UnknownSong = "Unknown Song";
         public const string UnknownAuthor = "Unknown Author";
-    }
-}
+		public const string UnknownCharacter = "Unknown Character";
+	}
+}