From 0c2db7a23abb6e506a58fec1a63bb671f8118df1 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Mon, 4 Mar 2024 19:55:30 -0800
Subject: [PATCH] SV_PerformLoad: Saner check for if we can call Destroy()...

---
 src/server/entry.qc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/entry.qc b/src/server/entry.qc
index 1ff831a3..eba0d5e1 100644
--- a/src/server/entry.qc
+++ b/src/server/entry.qc
@@ -705,8 +705,8 @@ SV_PerformLoad(float fh, float entcount, float playerslots)
 #ifdef REEDICT
 	while ((e=nextent(e))) {
 		if (edict_num(1) != e)
-			NSEntity toRemove = (NSEntity)e;
-			if (toRemove.Destroy) {
+			if (e.identity) {
+				NSEntity toRemove = (NSEntity)e;
 				toRemove.Destroy();
 			} else {
 				remove(e);
@@ -753,9 +753,9 @@ SV_PerformLoad(float fh, float entcount, float playerslots)
 				loadent = (NSEntity)e;
 				self = eold;
 			} else {
-				NSEntity toRemove = (NSEntity)e;
 				NSError("Could not spawn %s", cname);
-				if (toRemove.Destroy) {
+				if (e.identity) {
+					NSEntity toRemove = (NSEntity)e;
 					toRemove.Destroy();
 				} else {
 					remove(e);