mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-11 15:58:36 +00:00
Trevius: Mercenaries can now zone once again.
This commit is contained in:
+17
-2
@@ -1069,14 +1069,29 @@ void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, co
|
||||
void Client::LeaveGroup() {
|
||||
Group *g = GetGroup();
|
||||
|
||||
if(g) {
|
||||
if(g)
|
||||
{
|
||||
if(g->GroupCount() < 3)
|
||||
{
|
||||
g->DisbandGroup();
|
||||
}
|
||||
else
|
||||
{
|
||||
g->DelMember(this);
|
||||
} else {
|
||||
if (GetMerc() && GetMerc()->HasGroup() && GetMerc()->GetGroup() == g)
|
||||
{
|
||||
g->DelMember(GetMerc());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//force things a little
|
||||
database.SetGroupID(GetName(), 0, CharacterID());
|
||||
if (GetMerc())
|
||||
{
|
||||
database.SetGroupID(GetMerc()->GetName(), 0, CharacterID());
|
||||
}
|
||||
}
|
||||
|
||||
isgrouped = false;
|
||||
|
||||
Reference in New Issue
Block a user