From 1d2a89dad4fdfdae094d7221349d5ca5df28359d Mon Sep 17 00:00:00 2001
From: WinterSolstice8 <60417494+wintersolstice8@users.noreply.github.com>
Date: Thu, 6 Feb 2025 14:42:41 -0700
Subject: [PATCH] [core] Don't despawn self if gm hidden

---
 src/map/zone_entities.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/map/zone_entities.cpp b/src/map/zone_entities.cpp
index e888eb1914a..0423e57299e 100644
--- a/src/map/zone_entities.cpp
+++ b/src/map/zone_entities.cpp
@@ -1025,8 +1025,8 @@ void CZoneEntities::SpawnPCs(CCharEntity* PChar)
 
     FOR_EACH_PAIR_CAST_SECOND(CCharEntity*, PCurrentChar, PChar->SpawnPCList)
     {
-        // Despawn character if it's a hidden GM, is in a different mog house, or if player is in a conflict while other is not, or too far up/down
-        if (PCurrentChar->m_isGMHidden ||
+        // Despawn character if it's a hidden GM that isn't PChar, is in a different mog house, or if player is in a conflict while other is not, or too far up/down
+        if (((PChar != PCurrentChar) && PCurrentChar->m_isGMHidden) ||
             PChar->m_moghouseID != PCurrentChar->m_moghouseID ||
             !isWithinVerticalDistance(PChar, PCurrentChar))
         {