diff --git a/src/strategy/rogue/RogueTriggers.cpp b/src/strategy/rogue/RogueTriggers.cpp index b4a4f1b7..8355dc06 100644 --- a/src/strategy/rogue/RogueTriggers.cpp +++ b/src/strategy/rogue/RogueTriggers.cpp @@ -29,6 +29,9 @@ bool StealthTrigger::IsActive() float distance = 30.f; Unit* target = AI_VALUE(Unit*, "enemy player target"); + if (target && !target->IsInWorld()) { + return false; + } if (!target) target = AI_VALUE(Unit*, "grind target"); @@ -76,6 +79,10 @@ bool SprintTrigger::IsActive() Unit* dps = AI_VALUE(Unit*, "dps target"); Unit* enemyPlayer = AI_VALUE(Unit*, "enemy player target"); + + if (enemyPlayer && !enemyPlayer->IsInWorld()) { + return false; + } if (dps) targeted = (dps == AI_VALUE(Unit*, "current target")); diff --git a/src/strategy/values/NearestUnitsValue.h b/src/strategy/values/NearestUnitsValue.h index f1dd7940..7b262370 100644 --- a/src/strategy/values/NearestUnitsValue.h +++ b/src/strategy/values/NearestUnitsValue.h @@ -15,7 +15,7 @@ class NearestUnitsValue : public ObjectGuidListCalculatedValue { public: NearestUnitsValue(PlayerbotAI* botAI, std::string const name = "nearest units", float range = sPlayerbotAIConfig->sightDistance, bool ignoreLos = false) : - ObjectGuidListCalculatedValue(botAI, name, 1 * 1000), range(range), ignoreLos(ignoreLos) { } + ObjectGuidListCalculatedValue(botAI, name, 1), range(range), ignoreLos(ignoreLos) { } GuidVector Calculate() override; diff --git a/src/strategy/values/SnareTargetValue.h b/src/strategy/values/SnareTargetValue.h index 45577781..744743be 100644 --- a/src/strategy/values/SnareTargetValue.h +++ b/src/strategy/values/SnareTargetValue.h @@ -14,7 +14,7 @@ class Unit; class SnareTargetValue : public UnitCalculatedValue, public Qualified { public: - SnareTargetValue(PlayerbotAI* botAI) : UnitCalculatedValue(botAI, "snare target", 1 * 1000) { } + SnareTargetValue(PlayerbotAI* botAI) : UnitCalculatedValue(botAI, "snare target", 1) { } protected: Unit* Calculate() override;