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

Pet stop does not clear aggro

Browse Source
This commit is contained in:
Michael Cook (mackal)
2017-05-04 23:08:46 -04:00
parent fe9fb72dff
commit 0e96e6689a
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
-2
View File
@@ -10421,7 +10421,6 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
} else { } else {
mypet->SetPetStop(true); mypet->SetPetStop(true);
mypet->SetCurrentSpeed(0); mypet->SetCurrentSpeed(0);
mypet->WipeHateList();
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
} }
mypet->Say_StringID(MT_PetResponse, PET_GETLOST_STRING); 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) { if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
mypet->SetPetStop(true); mypet->SetPetStop(true);
mypet->SetCurrentSpeed(0); mypet->SetCurrentSpeed(0);
mypet->WipeHateList();
mypet->SetTarget(nullptr); mypet->SetTarget(nullptr);
mypet->Say_StringID(MT_PetResponse, PET_GETLOST_STRING); mypet->Say_StringID(MT_PetResponse, PET_GETLOST_STRING);
} }
zone/mob_ai.cpp
+1 -2
View File
@@ -935,7 +935,7 @@ void Mob::AI_Process() {
bool engaged = IsEngaged(); bool engaged = IsEngaged();
bool doranged = false; bool doranged = false;
if (!zone->CanDoCombat()) { if (!zone->CanDoCombat() || IsPetStop()) {
engaged = false; engaged = false;
} }
@@ -1300,7 +1300,6 @@ void Mob::AI_Process() {
} }
} }
else { else {
if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)) if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))
SendRemovePlayerState(PlayerState::Aggressive); SendRemovePlayerState(PlayerState::Aggressive);