From 1a556f44519788a689b747c3f6e74cf16db6b112 Mon Sep 17 00:00:00 2001 From: mmcgarvey Date: Wed, 12 Jan 2022 17:04:18 -0500 Subject: [PATCH] [XTarget] Performance Improvement After Corpse Change (#1918) Removed a conditional that was rendered obsolete by moving the addition of a mob to the auto haters list to fire after an IsValidXTarget check. This made an entity_list call unnecessary. [zone/client.cpp] Removed said unnecessary entity_list call. [zone/client.cpp] Removed a superfluous call to ProcessXTargetAutoHaters [zone/attack.cpp] --- zone/attack.cpp | 1 - zone/client.cpp | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index 3216b92d7..c2e85530f 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -1799,7 +1799,6 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQ::skills::Skill entity_list.RemoveFromTargets(this, true); hate_list.RemoveEntFromHateList(this); RemoveAutoXTargets(); - ProcessXTargetAutoHaters(); //remove ourself from all proximities ClearAllProximities(); diff --git a/zone/client.cpp b/zone/client.cpp index 2bf75bf7f..abfa0e8e0 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -7426,9 +7426,7 @@ void Client::ProcessXTargetAutoHaters() std::queue empty_slots; for (int i = 0; i < GetMaxXTargets(); ++i) { if (XTargets[i].Type != Auto) - continue; - - auto *mob = entity_list.GetMob(XTargets[i].ID); + continue; if (XTargets[i].ID != 0 && !GetXTargetAutoMgr()->contains_mob(XTargets[i].ID)) { XTargets[i].ID = 0; @@ -7436,12 +7434,6 @@ void Client::ProcessXTargetAutoHaters() XTargets[i].dirty = true; } - if (XTargets[i].ID != 0 && mob && !mob->IsValidXTarget()) { - XTargets[i].ID = 0; - XTargets[i].Name[0] = 0; - XTargets[i].dirty = true; - } - if (XTargets[i].ID == 0) { empty_slots.push(i); continue;