From c92871d31722085a5e172422ca406310159585e2 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 24 Oct 2020 11:28:02 -0400
Subject: [PATCH] Fix name tags showing for dead or invisible players

---
 src/k_hud.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/k_hud.c b/src/k_hud.c
index 73e656fcb..b3ea7cd29 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -2555,6 +2555,18 @@ static void K_drawKartNameTags(void)
 			continue;
 		}
 
+		if (ntplayer->mo->drawflags & K_GetPlayerDontDrawFlag(stplyr))
+		{
+			// Invisible on this screen
+			continue;
+		}
+
+		if ((gametyperules & GTR_BUMPERS) && (ntplayer->bumpers <= 0))
+		{
+			// Dead in Battle
+			continue;
+		}
+
 		if (!P_CheckSight(stplyr->mo, ntplayer->mo))
 		{
 			// Can't see