Add fix for scenario where a client traveled far distance quickly and mob scanning is too slow; this takes care of all scenarios

This commit is contained in:
Akkadius 2020-07-07 01:19:02 -05:00
parent 520ac3ae46
commit 4e6c3b524f
2 changed files with 17 additions and 13 deletions

View File

@ -256,7 +256,7 @@ bool Client::Process() {
* Used in aggro checks
*/
if (mob_close_scan_timer.Check()) {
entity_list.ScanCloseMobs(close_mobs, this);
entity_list.ScanCloseMobs(close_mobs, this, true);
}
bool may_use_attacks = false;

View File

@ -2716,21 +2716,25 @@ void EntityList::ScanCloseMobs(
}
float distance = DistanceSquared(scanning_mob->GetPosition(), mob->GetPosition());
if (distance <= scan_range) {
if (distance <= scan_range || mob->GetAggroRange() >= scan_range) {
close_mobs.insert(std::pair<uint16, Mob *>(mob->GetID(), mob));
if (add_self_to_other_lists) {
mob->close_mobs.insert(std::pair<uint16, Mob *>(scanning_mob->GetID(), scanning_mob));
}
}
else if (mob->GetAggroRange() >= scan_range) {
close_mobs.insert(std::pair<uint16, Mob *>(mob->GetID(), mob));
bool has_mob = false;
if (add_self_to_other_lists) {
for (auto &cm: mob->close_mobs) {
if (scanning_mob->GetID() == cm.first) {
has_mob = true;
break;
}
}
if (!has_mob) {
mob->close_mobs.insert(std::pair<uint16, Mob *>(scanning_mob->GetID(), scanning_mob));
}
}
}
}
LogAIScanClose(
"[{}] Scanning Close List | list_size [{}] moving [{}]",