diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 6281a5af8..15c5e8301 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -10421,7 +10421,6 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) } else { mypet->SetPetStop(true); mypet->SetCurrentSpeed(0); - mypet->WipeHateList(); mypet->SetTarget(nullptr); } mypet->Say_StringID(MT_PetResponse, PET_GETLOST_STRING); @@ -10434,7 +10433,6 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app) if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) { mypet->SetPetStop(true); mypet->SetCurrentSpeed(0); - mypet->WipeHateList(); mypet->SetTarget(nullptr); mypet->Say_StringID(MT_PetResponse, PET_GETLOST_STRING); } diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index ac77c9c74..47cd0b1d4 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -935,7 +935,7 @@ void Mob::AI_Process() { bool engaged = IsEngaged(); bool doranged = false; - if (!zone->CanDoCombat()) { + if (!zone->CanDoCombat() || IsPetStop()) { engaged = false; } @@ -1300,7 +1300,6 @@ void Mob::AI_Process() { } } else { - if (m_PlayerState & static_cast(PlayerState::Aggressive)) SendRemovePlayerState(PlayerState::Aggressive);