From 52273b4971c923220bcbefa5c8bcaefe648a1968 Mon Sep 17 00:00:00 2001
From: kadeshar <kadeshar@gmail.com>
Date: Tue, 21 Apr 2026 19:37:54 +0200
Subject: [PATCH] Pull multiplier fix (#2317)

<!--
Thank you for contributing to mod-playerbots, please make sure that
you...
1. Submit your PR to the test-staging branch, not master.
2. Read the guidelines below before submitting.
3. Don't delete parts of this template.

DESIGN PHILOSOPHY: We prioritize STABILITY, PERFORMANCE, AND
PREDICTABILITY over behavioral realism.

Every action and decision executes PER BOT AND PER TRIGGER. Small
increases in logic complexity scale
poorly across thousands of bots and negatively affect all. We prioritize
a stable system over a smarter
one. Bots don't need to behave perfectly; believable behavior is the
goal, not human simulation.
Default behavior must be cheap in processing; expensive behavior must be
opt-in.

Before submitting, make sure your changes aligns with these principles.
-->

## Pull Request Description
<!-- Describe what this change does and why it is needed -->

Fix for pull strategy multiplier and ending pull command

## How to Test the Changes
<!--
- Step-by-step instructions to test the change.
- Any required setup (e.g. multiple players, number of bots, specific
configuration).
- Expected behavior and how to verify it.
-->

1. Invite tank bot
2. Order him to attack mob (not pull)

## Impact Assessment
<!-- As a generic test, before and after measure of pmon (playerbot pmon
tick) can help you here. -->
- Does this change increase per-bot/per-tick processing or risk scaling
poorly with thousands of bots?
    - - [x] No, not at all
    - - [ ] Minimal impact (**explain below**)
    - - [ ] Moderate impact (**explain below**)



- Does this change modify default bot behavior?
    - - [x] No
    - - [ ] Yes (**explain why**)



- Does this change add new decision branches or increase maintenance
complexity?
    - - [x] No
    - - [ ] Yes (**explain below**)



## AI Assistance
<!--
AI assistance is allowed, but all submitted code must be fully
understood, reviewed, and owned by the contributor.
We expect contributors to be honest about what they do and do not
understand.
-->
Was AI assistance used while working on this change?
- - [x] No
- - [ ] Yes (**explain below**)
<!--
If yes, please specify:
- Purpose of usage (e.g. brainstorming, refactoring, documentation, code
generation).
- Which parts of the change were influenced or generated, and whether it
was thoroughly reviewed.
-->



<!--
TRANSLATIONS:
Anything new that the bots say in chat must be in a translatable format.
This is done using GetBotTextOrDefault,
which you can search for in the codebase to find examples. Your code
needs to have English as the default fallback,
while the full translations need to be in an SQL update file. The
languages in the file are the nine language
options supported by AzerothCore: English, Korean, French, German,
Chinese, Taiwanese, Spanish, Spanish Mexico, and
Russian. See
data/sql/playerbots/updates/2025_12_27_ai_playerbot_fishing_text.sql as
an example of a translation SQL
update, whose content are called within the codebase at
src/strategy/actions/FishingAction.cpp
-->

## Final Checklist

- - [x] Stability is not compromised.
- - [x] Performance impact is understood, tested, and acceptable.
- - [x] Added logic complexity is justified and explained.
- - [x] Any new bot dialogue lines are translated.
- - [x] Documentation updated if needed (Conf comments, WiKi commands).

## Notes for Reviewers
<!-- Anything else that's helpful to review or test your pull request.
-->
---
 src/Ai/Base/Strategy/PullStrategy.cpp | 3 +++
 src/Ai/Base/Trigger/PullTriggers.cpp  | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Ai/Base/Strategy/PullStrategy.cpp b/src/Ai/Base/Strategy/PullStrategy.cpp
index 3d5e3e94a..31351c571 100644
--- a/src/Ai/Base/Strategy/PullStrategy.cpp
+++ b/src/Ai/Base/Strategy/PullStrategy.cpp
@@ -170,6 +170,9 @@ float PullMultiplier::GetValue(Action* action)
     if (!strategy || !strategy->HasTarget() || !action)
         return 1.0f;
 
+    if (!strategy->IsPullPendingToStart() && !strategy->HasPullStarted())
+        return 1.0f;
+
     std::string const actionName = action->getName();
     if (actionName == "pull my target" ||
         actionName == "pull rti target" ||
diff --git a/src/Ai/Base/Trigger/PullTriggers.cpp b/src/Ai/Base/Trigger/PullTriggers.cpp
index 84c550faf..4d23b3896 100644
--- a/src/Ai/Base/Trigger/PullTriggers.cpp
+++ b/src/Ai/Base/Trigger/PullTriggers.cpp
@@ -20,15 +20,12 @@ bool PullStartTrigger::IsActive()
 bool PullEndTrigger::IsActive()
 {
     PullStrategy const* strategy = PullStrategy::Get(botAI);
-    Player* bot = botAI->GetBot();
-    if (!bot)
-        return false;
 
     if (!strategy || !strategy->HasPullStarted())
         return false;
 
     Unit* target = strategy->GetTarget();
-    if (!target || !target->IsInWorld())
+    if (!target || !target->IsInWorld() || !target->IsAlive())
         return true;
 
     time_t const secondsSincePullStarted = time(nullptr) - strategy->GetPullStartTime();
@@ -53,9 +50,6 @@ bool PullEndTrigger::IsActive()
 bool ReturnToPullPositionTrigger::IsActive()
 {
     PullStrategy const* strategy = PullStrategy::Get(botAI);
-    Player* bot = botAI->GetBot();
-    if (!bot)
-        return false;
 
     Unit* target = strategy ? strategy->GetTarget() : nullptr;
     if (!strategy || !strategy->HasPullStarted() || !target || !target->IsInCombat() ||