From 68cb94b39ce43d74170079a25e585dc831cddcc2 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sat, 7 Oct 2023 13:59:47 -0500 Subject: [PATCH] [Crash] Bot member zoned crash fix (#3607) --- zone/groups.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zone/groups.cpp b/zone/groups.cpp index b90b26fcf..a16e7d487 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -555,8 +555,13 @@ void Group::MemberZoned(Mob* removemob) { //should NOT clear the name, it is used for world communication. for (auto & m : members) { - if (m && (m == removemob || (m->IsBot() && m->CastToBot()->GetBotOwner() == removemob))) { - m = nullptr; + if (m) { + if (m->IsBot() && m->CastToBot()->GetBotOwner() && m->CastToBot()->GetBotOwner() == removemob) { + m = nullptr; + } + else if (m == removemob) { + m = nullptr; + } } }