From a777725b7aa5e6b358a94feeebcf0c37e9e55864 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Tue, 25 Apr 2023 00:47:07 -0700
Subject: [PATCH] Who's Who: fix reviving HUD not being destroyed on fake down

---
 scripts/zm/replaced/_zm_laststand.gsc | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/zm/replaced/_zm_laststand.gsc b/scripts/zm/replaced/_zm_laststand.gsc
index ab73ca71..3c1b6c48 100644
--- a/scripts/zm/replaced/_zm_laststand.gsc
+++ b/scripts/zm/replaced/_zm_laststand.gsc
@@ -80,7 +80,7 @@ revive_do_revive( playerbeingrevived, revivergun )
 		self.revivetexthud = newclienthudelem( self );
 	}
 
-	self thread laststand_clean_up_on_disconnect( playerbeingrevived, revivergun );
+	self thread laststand_clean_up_on_disconnect( playerbeingrevived_player, revivergun );
 
 	if ( !isDefined( self.is_reviving_any ) )
 	{
@@ -88,7 +88,7 @@ revive_do_revive( playerbeingrevived, revivergun )
 	}
 
 	self.is_reviving_any++;
-	self thread laststand_clean_up_reviving_any( playerbeingrevived );
+	self thread laststand_clean_up_reviving_any( playerbeingrevived_player );
 	self.reviveprogressbar updatebar( 0.01, 1 / revivetime );
     playerbeingrevived_player.beingrevivedprogressbar updatebar( 0.01, 1 / revivetime );
 
@@ -241,7 +241,7 @@ laststand_clean_up_reviving_any( playerbeingrevived )
 {
 	self endon( "do_revive_ended_normally" );
 
-	playerbeingrevived waittill_any( "disconnect", "zombified", "stop_revive_trigger" );
+	playerbeingrevived waittill_any( "disconnect", "zombified", "stop_revive_trigger", "chugabud_effects_cleanup" );
 
 	self.is_reviving_any--;
 	if ( self.is_reviving_any < 0 )
@@ -253,6 +253,24 @@ laststand_clean_up_reviving_any( playerbeingrevived )
 	{
 		playerbeingrevived.beingrevivedprogressbar destroyelem();
 	}
+
+	if ( isDefined( playerbeingrevived.revive_hud ) )
+	{
+		playerbeingrevived.revive_hud settext("");
+	}
+
+	if ( !self.is_reviving_any )
+	{
+		if ( isDefined( self.reviveprogressbar ) )
+		{
+			self.reviveprogressbar destroyelem();
+		}
+
+		if ( isDefined( self.revivetexthud ) )
+		{
+			self.revivetexthud destroy();
+		}
+	}
 }
 
 revive_give_back_weapons( gun )