From b57be45b515fdff2374b9b948deecbaaf4d854c2 Mon Sep 17 00:00:00 2001 From: nytmyr <53322305+nytmyr@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:42:02 -0600 Subject: [PATCH] Cleanup bot logic in TryBackstab --- zone/special_attacks.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 26c5bd87e..71eec7255 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -727,19 +727,15 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) { } } else if (IsBot()) { - const EQ::ItemInstance* inst = CastToBot()->GetBotItem(EQ::invslot::slotPrimary); - const EQ::ItemData* botpiercer = nullptr; + auto bot = CastToBot(); + auto inst = bot->GetBotItem(EQ::invslot::slotPrimary); + auto bot_piercer = inst ? inst->GetItem() : nullptr; - if (inst) { - botpiercer = inst->GetItem(); - } - - if (!botpiercer || (botpiercer->ItemType != EQ::item::ItemType1HPiercing)) { - if (!CastToBot()->GetCombatRoundForAlerts()) { - CastToBot()->SetCombatRoundForAlerts(); - CastToBot()->RaidGroupSay(this, "I can't backstab with this weapon!"); + if (!bot_piercer || bot_piercer->ItemType != EQ::item::ItemType1HPiercing) { + if (!bot->GetCombatRoundForAlerts()) { + bot->SetCombatRoundForAlerts(); + bot->RaidGroupSay(this, "I can't backstab with this weapon!"); } - return; } }