Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Don't despawn self if gm hidden #6976

Merged
merged 1 commit into from
Feb 6, 2025
Merged

[core] Don't despawn self if gm hidden #6976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/map/zone_entities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
Loading