diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index cae85336a..bc74cc148 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -6689,7 +6689,6 @@ void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app) } } else if(memberToDisband->IsMerc()) { - Merc::RemoveMercFromGroup(memberToDisband->CastToMerc(), group); memberToDisband->CastToMerc()->Suspend(); } } diff --git a/zone/client_process.cpp b/zone/client_process.cpp index c2c12aa0d..6a28722a9 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -191,8 +191,6 @@ bool Client::Process() { if (GetMerc()) { GetMerc()->Save(); - if(GetMerc()->GetGroup() != NULL) - Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup()); GetMerc()->Depop(); } LeaveGroup(); @@ -210,8 +208,6 @@ bool Client::Process() { if (GetMerc()) { GetMerc()->Save(); - if(GetMerc()->GetGroup() != NULL) - GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup()); GetMerc()->Depop(); } instalog = true; @@ -680,8 +676,6 @@ bool Client::Process() { if (GetMerc()) { GetMerc()->Save(); - if(GetMerc()->GetGroup() != NULL) - GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup()); GetMerc()->Depop(); } return false; @@ -730,8 +724,6 @@ bool Client::Process() { } if (GetMerc()) { - if(GetMerc()->GetGroup() != NULL) - Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup()); GetMerc()->Depop(); } adverrorinfo = 811;