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

Allow NPCs to aggro player pets with NPCAggro field set in database and new rule AggroPlayerPets set to true (#1450)

Browse Source 
Co-authored-by: Natedog2012 <joewalters2012@gmail.com>
This commit is contained in:
Natedog2012 2021-07-08 11:38:57 -05:00 committed by GitHub
parent f5ab135906
commit 36e009a5bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -526,6 +526,7 @@ RULE_INT(Aggro, ClientAggroCheckMovingInterval, 1000, "Interval in which clients
RULE_INT(Aggro, ClientAggroCheckIdleInterval, 6000, "Interval in which clients actually check for aggro while idle - in milliseconds - this should be higher than ClientAggroCheckMovingInterval")
RULE_REAL(Aggro, PetAttackRange, 40000.0, "Maximum squared range /pet attack works at default is 200")
RULE_BOOL(Aggro, NPCAggroMaxDistanceEnabled, true, "If enabled, NPC's will drop aggro beyond 600 units or what is defined at the zone level")
RULE_BOOL(Aggro, AggroPlayerPets, false, "If enabled, NPCs will aggro player pets")
RULE_CATEGORY_END()
RULE_CATEGORY(TaskSystem)

2
zone/aggro.cpp
View File

@ -252,7 +252,7 @@ bool Mob::CheckWillAggro(Mob *mob) {
}
Mob *pet_owner = mob->GetOwner();
if (pet_owner && pet_owner->IsClient()) {
if (pet_owner && pet_owner->IsClient() && (!RuleB(Aggro, AggroPlayerPets) || pet_owner->CastToClient()->GetGM())) {
return false;
}