EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IsAggroed is redundant in these areas now since its based on engaged_encounter

Browse Source
This commit is contained in:
Emagi 2025-08-17 14:31:17 -04:00
parent 8f402eb781
commit 2858455d9d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/WorldServer/Entity.cpp
View File

@ -1065,7 +1065,7 @@ void Entity::InCombat(bool val){
bool update_regen = false; bool update_regen = false;
if(GetInfoStruct()->get_engaged_encounter()) { if(GetInfoStruct()->get_engaged_encounter()) {
if(!IsAggroed() || !IsEngagedInEncounter()) { if(!IsEngagedInEncounter()) {
GetInfoStruct()->set_engaged_encounter(0); GetInfoStruct()->set_engaged_encounter(0);
update_regen = true; update_regen = true;
} }

2
source/WorldServer/Player.cpp
View File

@ -4166,7 +4166,7 @@ void Player::InCombat(bool val, bool range) {
bool update_regen = false; bool update_regen = false;
if(GetInfoStruct()->get_engaged_encounter()) { if(GetInfoStruct()->get_engaged_encounter()) {
if(!IsAggroed() || !IsEngagedInEncounter()) { if(!IsEngagedInEncounter()) {
GetInfoStruct()->set_engaged_encounter(0); GetInfoStruct()->set_engaged_encounter(0);
update_regen = true; update_regen = true;
} }