From f634aa555ea359893082e1dd27dcda96698e8845 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Thu, 23 Mar 2023 20:11:06 -0700
Subject: [PATCH] Encounter: death barriers make players wait to respawn

---
 scripts/zm/replaced/_zm.gsc             | 17 +++++++++++++++--
 scripts/zm/zgrief/zgrief_reimagined.gsc |  5 +----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc
index bcee9df3..34e1c8c7 100644
--- a/scripts/zm/replaced/_zm.gsc
+++ b/scripts/zm/replaced/_zm.gsc
@@ -1269,10 +1269,18 @@ player_out_of_playable_area_monitor()
                     level notify( "end_game" );
                 else
                 {
-                    //self disableinvulnerability();
                     self.lives = 0;
                     self dodamage( self.health + 1000, self.origin );
-                    self.bleedout_time = 0;
+
+					if (isDefined(level.player_suicide_func))
+					{
+						wait 0.05;
+						self thread [[level.player_suicide_func]]();
+					}
+					else
+					{
+						self.bleedout_time = 0;
+					}
                 }
             }
         }
@@ -1281,6 +1289,11 @@ player_out_of_playable_area_monitor()
     }
 }
 
+get_player_out_of_playable_area_monitor_wait_time()
+{
+    return 1;
+}
+
 end_game()
 {
 	level waittill( "end_game" );
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 5863b7c7..cbfd73ed 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -2468,10 +2468,7 @@ unlimited_powerups()
 
 player_suicide()
 {
-	if (self.bleedout_time <= 0)
-	{
-		self.bleedout_time = 1;
-	}
+	self.bleedout_time += 1;
 
 	self notify( "player_suicide" );