From 137a5e5c3d5d443883b95bdedde55be2528a6f53 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sun, 12 Mar 2023 07:21:27 -0700
Subject: [PATCH] Players no longer respawn if they were alive at the end of
 Battle of Nimbus Station (#1017)

---
 dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h | 2 ++
 dScripts/BaseWavesServer.cpp                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h b/dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h
index 06503d19..637aceb7 100644
--- a/dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h
+++ b/dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "BaseWavesServer.h"
 
+#include "dCommonVars.h"
+
 enum SpawnerName {
 	interior_A,
 	interior_B,
diff --git a/dScripts/BaseWavesServer.cpp b/dScripts/BaseWavesServer.cpp
index ad40a77d..00340bd0 100644
--- a/dScripts/BaseWavesServer.cpp
+++ b/dScripts/BaseWavesServer.cpp
@@ -430,7 +430,7 @@ void BaseWavesServer::SpawnWave(Entity* self) {
 
 		for (const auto& playerID : state.players) {
 			auto* player = EntityManager::Instance()->GetEntity(playerID);
-			if (player != nullptr) {
+			if (player && player->GetIsDead()) {
 				player->Resurrect();
 			}
 		}