Merge pull request #6222 from jmcmorris/mob_party_clear

Clear the mob's party when removing a party member
LandSandBoat · Sep 7, 2024 · b77fe93 · b77fe93
2 parents d79a273 + fe8d0bf
commit b77fe93
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/map/party.cpp b/src/map/party.cpp
@@ -346,7 +346,6 @@ void CParty::RemoveMember(CBattleEntity* PEntity)
                 PChar->pushPacket(new CPartyDefinePacket(nullptr));
                 PChar->pushPacket(new CPartyMemberUpdatePacket(PChar, 0, 0, PChar->getZone()));
                 PChar->pushPacket(new CCharUpdatePacket(PChar));
-                PChar->PParty = nullptr;
 
                 _sql->Query("DELETE FROM accounts_parties WHERE charid = %u", PChar->id);
 
@@ -370,7 +369,9 @@ void CParty::RemoveMember(CBattleEntity* PEntity)
                     PChar->PTreasurePool->UpdatePool(PChar);
                 }
             }
+
             members.erase(memberToDelete);
+            PEntity->PParty = nullptr;
         }
     }
 }