pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Target Locked Pet Taunt (#3894)

Browse Source 
* [Bug Fix] Target Locked pet taunt

Target locked pets shouldn't taunt

* Update mob.h

---------

Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Fryguy 2024-01-07 16:22:37 -05:00 committed by GitHub
parent 4490a53ba0
commit cd85a8524a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/mob.h
View File

@ -1053,14 +1053,14 @@ public:
Mob* GetUltimateOwner(); Mob* GetUltimateOwner();
void SetPetID(uint16 NewPetID); void SetPetID(uint16 NewPetID);
inline uint16 GetPetID() const { return petid; } inline uint16 GetPetID() const { return petid; }
inline PetType GetPetType() const { return typeofpet; } inline PetType GetPetType() const { return type_of_pet; }
void SetPetType(PetType p) { typeofpet = p; } void SetPetType(PetType p) { type_of_pet = p; }
inline int16 GetPetPower() const { return (petpower < 0) ? 0 : petpower; } inline int16 GetPetPower() const { return (petpower < 0) ? 0 : petpower; }
void SetPetPower(int16 p) { if (p < 0) petpower = 0; else petpower = p; } void SetPetPower(int16 p) { if (p < 0) petpower = 0; else petpower = p; }
bool IsFamiliar() const { return(typeofpet == petFamiliar); } bool IsFamiliar() const { return type_of_pet == petFamiliar; }
bool IsAnimation() const { return(typeofpet == petAnimation); } bool IsAnimation() const { return type_of_pet == petAnimation; }
bool IsCharmed() const { return(typeofpet == petCharmed); } bool IsCharmed() const { return type_of_pet == petCharmed; }
bool IsTargetLockPet() const { return(typeofpet == petTargetLock); } bool IsTargetLockPet() const { return type_of_pet == petTargetLock; }
inline uint32 GetPetTargetLockID() { return pet_targetlock_id; }; inline uint32 GetPetTargetLockID() { return pet_targetlock_id; };
inline void SetPetTargetLockID(uint32 value) { pet_targetlock_id = value; }; inline void SetPetTargetLockID(uint32 value) { pet_targetlock_id = value; };
void SetOwnerID(uint16 NewOwnerID); void SetOwnerID(uint16 NewOwnerID);
@ -1252,7 +1252,7 @@ public:
bool CheckWillAggro(Mob *mob); bool CheckWillAggro(Mob *mob);
void InstillDoubt(Mob *who); void InstillDoubt(Mob *who);
bool Charmed() const { return typeofpet == petCharmed; } bool Charmed() const { return type_of_pet == petCharmed; }
static uint32 GetLevelHP(uint8 tlevel); static uint32 GetLevelHP(uint8 tlevel);
uint32 GetZoneID() const; //for perl uint32 GetZoneID() const; //for perl
uint16 GetInstanceVersion() const; //for perl uint16 GetInstanceVersion() const; //for perl
@ -1531,7 +1531,7 @@ protected:
StatBonuses aabonuses; StatBonuses aabonuses;
uint16 petid; uint16 petid;
uint16 ownerid; uint16 ownerid;
PetType typeofpet; PetType type_of_pet;
int16 petpower; int16 petpower;
uint32 follow_id; uint32 follow_id;
uint32 follow_dist; uint32 follow_dist;

4
zone/special_attacks.cpp
View File

@ -1812,7 +1812,9 @@ void NPC::DoClassAttacks(Mob *target) {
HasOwner() && HasOwner() &&
target->IsNPC() && target->IsNPC() &&
target->GetBodyType() != BT_Undead && target->GetBodyType() != BT_Undead &&
taunt_time taunt_time &&
type_of_pet &&
type_of_pet != petTargetLock
) { ) {
GetOwner()->MessageString(Chat::PetResponse, PET_TAUNTING); GetOwner()->MessageString(Chat::PetResponse, PET_TAUNTING);
Taunt(target->CastToNPC(), false); Taunt(target->CastToNPC(), false);