From 86b98da892093aed3c45cb0b8fc63069131fdb8d Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sat, 22 Apr 2023 21:55:15 -0700
Subject: [PATCH] Encounter: fix game ending during pregame lobby

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

diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc
index dd448c69..b661c774 100644
--- a/scripts/zm/replaced/_zm.gsc
+++ b/scripts/zm/replaced/_zm.gsc
@@ -610,8 +610,6 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
     if ( destroyed_afterwards == 1 )
         level.introscreen destroy();
 
-	level.match_started = 1;
-
     flag_set( "initial_blackscreen_passed" );
 }
 
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index baf9476f..34ea975a 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -727,7 +727,7 @@ grief_onplayerdisconnect(disconnecting_player)
 		disconnecting_player.player_waypoint destroy();
 	}
 
-	if(!flag("initial_players_connected"))
+	if(!flag("initial_blackscreen_passed"))
 	{
 		return;
 	}
@@ -1583,7 +1583,7 @@ should_respawn()
 		return 0;
 	}
 
-	if (!is_true(level.match_started))
+	if (!flag("initial_blackscreen_passed"))
 	{
 		return 1;
 	}