Imrpove dog tag generation

project-fika · Sep 30, 2024 · 08c504a · 08c504a
1 parent 8a45ca9
commit 08c504a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs
@@ -762,9 +762,10 @@ private void GenerateDogtagDetails()
 			string accountId = AccountId;
 			string profileId = ProfileId;
 			string nickname = Profile.Nickname;
-			string killerAccountId = LastAggressor != null ? LastAggressor.AccountId : string.Empty;
-			string killerProfileId = LastAggressor != null ? LastAggressor.ProfileId : string.Empty;
-			string killerNickname = LastAggressor != null ? LastAggressor.Profile.Nickname : string.Empty;
+			bool hasAggressor = LastAggressor != null;
+			string killerAccountId = hasAggressor ? LastAggressor.AccountId : string.Empty;
+			string killerProfileId = hasAggressor ? LastAggressor.ProfileId : string.Empty;
+			string killerNickname = (hasAggressor && !string.IsNullOrEmpty(LastAggressor.Profile.Nickname)) ? LastAggressor.Profile.Nickname : string.Empty;
 			EPlayerSide side = Side;
 			int level = Profile.Info.Level;
 			DateTime time = EFTDateTimeClass.UtcNow;