From 08c504a74a3fb547d56102d88eda513b64aad1a5 Mon Sep 17 00:00:00 2001
From: Lacyway <20912169+Lacyway@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:36:41 +0200
Subject: [PATCH] Imrpove dog tag generation

---
 Fika.Core/Coop/Players/CoopPlayer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs
index d90966f3..80f403fe 100644
--- 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;