From be39bb16a37d7b3155da6bb90e83818e45faf229 Mon Sep 17 00:00:00 2001
From: image <>
Date: Tue, 22 Sep 2020 23:01:25 -0400
Subject: [PATCH] fixed crash bug running process when we should be removing
 the dead client

---
 EQ2/source/WorldServer/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EQ2/source/WorldServer/client.cpp b/EQ2/source/WorldServer/client.cpp
index 231a36fcf..528fae908 100644
--- a/EQ2/source/WorldServer/client.cpp
+++ b/EQ2/source/WorldServer/client.cpp
@@ -3003,7 +3003,7 @@ void ClientList::Process() {
 	for (client_iter = client_list.begin(); client_iter != client_list.end(); client_iter++) {
 		client = *client_iter;
 		// have a sanity check because the client list can sometimes obtain null client pointers
-		if (!client || (!client->Process() || client->remove_from_list)) {
+		if (!client || client->remove_from_list || (!client->Process())) { // if we should be removing from list, don't process any further
 			erase_iter = client_iter;
 			break;
 		}