diff --git a/zone/client_process.cpp b/zone/client_process.cpp index f8dd10240..662f58500 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -191,7 +191,7 @@ bool Client::Process() { if (GetMerc()) { GetMerc()->Save(); - if(GetMerc()->GetGroup != NULL) + if(GetMerc()->GetGroup() != NULL) GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup()); GetMerc()->Depop(); } diff --git a/zone/merc.cpp b/zone/merc.cpp index d176457fa..5e8293d3b 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -4915,8 +4915,6 @@ void Merc::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_sk if(entity_list.GetCorpseByID(GetID())) entity_list.GetCorpseByID(GetID())->Depop(); - entity_list.RemoveMerc(GetID()); - if(Suspend()) { } @@ -5775,13 +5773,12 @@ bool Merc::Dismiss(){ void Merc::Zone() { Save(); - entity_list.RemoveMerc(this->GetID()); Depop(); } void Merc::Depop() { WipeHateList(); - + entity_list.RemoveMerc(this->GetID()); entity_list.RemoveFromHateLists(this); if(HasGroup())