pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Grouping with Mercenaries is considerably less buggy.

Browse Source
This commit is contained in:
Trevius
2014-11-22 00:22:12 -06:00
parent b5c6b47639
commit c5a90adb39
12 changed files with 595 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/worldserver.cpp
+32 -39
View File
@@ -831,12 +831,11 @@ void WorldServer::Process() {
}
case ServerOP_GroupInvite: {
// A player in another zone invited a player in this zone to join their group.
//
GroupInvite_Struct* gis = (GroupInvite_Struct*)pack->pBuffer;
Mob *Invitee = entity_list.GetMob(gis->invitee_name);
if(Invitee && Invitee->IsClient() && !Invitee->IsGrouped() && !Invitee->IsRaidGrouped())
if(Invitee && Invitee->IsClient() && Invitee->CastToClient()->MercOnlyOrNoGroup() && !Invitee->IsRaidGrouped())
{
EQApplicationPacket* outapp = new EQApplicationPacket(OP_GroupInvite, sizeof(GroupInvite_Struct));
memcpy(outapp->pBuffer, gis, sizeof(GroupInvite_Struct));
@@ -848,7 +847,6 @@ void WorldServer::Process() {
}
case ServerOP_GroupFollow: {
// Player in another zone accepted a group invitation from a player in this zone.
//
ServerGroupFollow_Struct* sgfs = (ServerGroupFollow_Struct*) pack->pBuffer;
Mob* Inviter = entity_list.GetClientByName(sgfs->gf.name1);
@@ -857,12 +855,15 @@ void WorldServer::Process() {
{
Group* group = entity_list.GetGroupByClient(Inviter->CastToClient());
if(!group){
if(!group)
{
//Make new group
group = new Group(Inviter);
if(!group)
if (!group)
{
break;
}
entity_list.AddGroup(group);
@@ -871,10 +872,8 @@ void WorldServer::Process() {
break;
}
database.SetGroupID(Inviter->GetName(), group->GetID(), Inviter->CastToClient()->CharacterID());
database.SetGroupID(Inviter->GetName(), group->GetID(), Inviter->CastToClient()->CharacterID(), false);
database.SetGroupLeaderName(group->GetID(), Inviter->GetName());
group->UpdateGroupAAs();
if(Inviter->CastToClient()->GetClientVersion() < EQClientSoD)
@@ -891,25 +890,22 @@ void WorldServer::Process() {
else
{
// SoD and later
//
Inviter->CastToClient()->SendGroupCreatePacket();
Inviter->CastToClient()->SendGroupLeaderChangePacket(Inviter->GetName());
Inviter->CastToClient()->SendGroupJoinAcknowledge();
}
}
if(!group)
{
break;
}
EQApplicationPacket* outapp=new EQApplicationPacket(OP_GroupFollow, sizeof(GroupGeneric_Struct));
GroupGeneric_Struct *gg = (GroupGeneric_Struct *)outapp->pBuffer;
strn0cpy(gg->name1, sgfs->gf.name1, sizeof(gg->name1));
strn0cpy(gg->name2, sgfs->gf.name2, sizeof(gg->name2));
Inviter->CastToClient()->QueuePacket(outapp);
safe_delete(outapp);
if(!group->AddMember(nullptr, sgfs->gf.name2, sgfs->CharacterID))
@@ -919,46 +915,35 @@ void WorldServer::Process() {
Inviter->CastToClient()->UpdateLFP();
ServerPacket* pack2 = new ServerPacket(ServerOP_GroupJoin, sizeof(ServerGroupJoin_Struct));
ServerGroupJoin_Struct* gj = (ServerGroupJoin_Struct*)pack2->pBuffer;
gj->gid = group->GetID();
gj->zoneid = zone->GetZoneID();
gj->instance_id = zone->GetInstanceID();
strn0cpy(gj->member_name, sgfs->gf.name2, sizeof(gj->member_name));
worldserver.SendPacket(pack2);
safe_delete(pack2);
// Send acknowledgement back to the Invitee to let them know we have added them to the group.
//
ServerPacket* pack3 = new ServerPacket(ServerOP_GroupFollowAck, sizeof(ServerGroupFollowAck_Struct));
ServerGroupFollowAck_Struct* sgfas = (ServerGroupFollowAck_Struct*)pack3->pBuffer;
strn0cpy(sgfas->Name, sgfs->gf.name2, sizeof(sgfas->Name));
worldserver.SendPacket(pack3);
safe_delete(pack3);
}
break;
}
case ServerOP_GroupFollowAck: {
// The Inviter (in another zone) has successfully added the Invitee (in this zone) to the group.
//
ServerGroupFollowAck_Struct* sgfas = (ServerGroupFollowAck_Struct*)pack->pBuffer;
Client *c = entity_list.GetClientByName(sgfas->Name);
Client *client = entity_list.GetClientByName(sgfas->Name);
if(!c)
if(!client)
break;
uint32 groupid = database.GetGroupID(c->GetName());
uint32 groupid = database.GetGroupID(client->GetName());
Group* group = nullptr;
@@ -974,26 +959,30 @@ void WorldServer::Process() {
entity_list.AddGroup(group, groupid);
else
group = nullptr;
} //else, somebody from our group is already here...
}
if(group)
group->UpdatePlayer(c);
group->UpdatePlayer(client);
else
{
if(c->GetMerc())
database.SetGroupID(c->GetMerc()->GetCleanName(), 0, c->CharacterID(), true);
database.SetGroupID(c->GetName(), 0, c->CharacterID()); //cannot re-establish group, kill it
if(client->GetMerc())
database.SetGroupID(client->GetMerc()->GetCleanName(), 0, client->CharacterID(), true);
database.SetGroupID(client->GetName(), 0, client->CharacterID(), false); //cannot re-establish group, kill it
}
}
if(group)
{
database.RefreshGroupFromDB(c);
if (client->GetMerc())
{
client->GetMerc()->MercJoinClientGroup();
}
database.RefreshGroupFromDB(client);
group->SendHPPacketsTo(c);
group->SendHPPacketsTo(client);
// If the group leader is not set, pull the group leader infomrmation from the database.
// If the group leader is not set, pull the group leader information from the database.
if(!group->GetLeader())
{
char ln[64];
@@ -1019,6 +1008,10 @@ void WorldServer::Process() {
}
}
else if (client->GetMerc())
{
client->GetMerc()->MercJoinClientGroup();
}
break;
}