pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-06 10:22:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix /pet leader

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-02-06 21:50:59 -05:00
parent cdd0b2de00
commit 24b396e516
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zone/client_packet.cpp
View File

@ -9960,22 +9960,18 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
Mob* mypet = this->GetPet(); Mob* mypet = this->GetPet();
Mob *target = entity_list.GetMob(pet->target); Mob *target = entity_list.GetMob(pet->target);
if (!mypet || pet->command == PET_LEADER) if (!mypet || pet->command == PET_LEADER) {
{ if (pet->command == PET_LEADER) {
if (pet->command == PET_LEADER) // we either send the ID of an NPC we're interested in or no ID for our own pet
{ if (target) {
if (mypet && (!GetTarget() || GetTarget() == mypet)) auto owner = target->GetOwner();
{ if (owner)
target->Say_StringID(PET_LEADERIS, owner->GetCleanName());
else
target->Say_StringID(I_FOLLOW_NOONE);
} else if (mypet) {
mypet->Say_StringID(PET_LEADERIS, GetName()); mypet->Say_StringID(PET_LEADERIS, GetName());
} }
else if ((mypet = GetTarget()))
{
Mob *Owner = mypet->GetOwner();
if (Owner)
mypet->Say_StringID(PET_LEADERIS, Owner->GetCleanName());
else if (mypet->IsNPC())
mypet->Say_StringID(I_FOLLOW_NOONE);
}
} }
return; return;