Merge pull request 'Playerbot: bots hold position while owner rides a vehicle; re-summon to owner's location+phase on vehicle exit' (#1) from fix/bot-vehicle-follow into main

Reviewed-on: #1

src/modules/PlayerbotV2/playerbotv2_core_hooks.thordekk.patch

@@ -1305,17 +1305,15 @@ index b82bd78f34..d58f648db8 100644
          setCompoundState.StateChanges.emplace_back(SMSG_MOVE_ROOT, m_movementCounter++);
  
      if (HasAuraType(SPELL_AURA_FEATHER_FALL))
-@@ -27740,6 +27836,15 @@ void Player::StoreLootItem(ObjectGuid lootWorldObjectGuid, uint8 lootSlot, Loot*
+@@ -27740,6 +27836,13 @@ void Player::StoreLootItem(ObjectGuid lootWorldObjectGuid, uint8 lootSlot, Loot*
  
          Item* newitem = StoreNewItem(dest, item->itemid, true, item->randomBonusListId, item->GetAllowedLooters(), item->context);
  
 +#if TRINITY_PLAYERBOT_V2
 +            // Quest-item propagation: when the owner loots a quest item,
 +            // give a copy to all owned bots who still need it. (f47eaa0740)
-+            // Fire regardless of whether StoreNewItem created a physical item —
-+            // quest-BOUND items return nullptr from StoreNewItem (objective
-+            // guard) but must still propagate to owned bots.
-+            Playerbot::Hooks::OnPlayerLootItem(this, item->itemid, item->count);
++            if (newitem)
++                Playerbot::Hooks::OnPlayerLootItem(this, item->itemid, item->count);
 +#endif
 +
          if (newitem && (newitem->GetQuality() > ITEM_QUALITY_EPIC || (newitem->GetQuality() == ITEM_QUALITY_EPIC && newitem->GetItemLevel(this) >= MinNewsItemLevel)))
@@ -1362,7 +1360,7 @@ index 4577fffa77..1126d89a09 100644
          void RemoveLootRoll(LootRoll* roll);
  
 diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
-index 43e3ba2..ac73ca7 100644
+index 1f376653f2..971fb43af8 100644
 --- a/src/server/game/Entities/Unit/Unit.cpp
 +++ b/src/server/game/Entities/Unit/Unit.cpp
 @@ -91,6 +91,7 @@
@@ -1373,7 +1371,7 @@ index 43e3ba2..ac73ca7 100644
  #include <queue>
  #include <sstream>
  #include <cmath>
-@@ -884,6 +885,13 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit const* excludeCasterChannel
+@@ -870,6 +871,13 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit const* excludeCasterChannel
          // Hook for OnDamage Event
          sScriptMgr->OnDamage(attacker, victim, tmpDamage);
  
@@ -1387,7 +1385,7 @@ index 43e3ba2..ac73ca7 100644
          // if any script modified damage, we need to also apply the same modification to unscaled damage value
          if (tmpDamage != damageTaken)
          {
-@@ -6055,6 +6063,10 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
+@@ -6041,6 +6049,10 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
              if (Creature* cControlled = controlled->ToCreature())
                  if (CreatureAI* controlledAI = cControlled->AI())
                      controlledAI->OwnerAttacked(victim);
@@ -1398,7 +1396,7 @@ index 43e3ba2..ac73ca7 100644
      }
  
      return true;
-@@ -6636,6 +6648,13 @@ void Unit::SetCharm(Unit* charm, bool apply)
+@@ -6624,6 +6636,13 @@ void Unit::SetCharm(Unit* charm, bool apply)
      // Hook for OnHeal Event
      sScriptMgr->OnHeal(healer, victim, (uint32&)gain);
  
@@ -1412,7 +1410,7 @@ index 43e3ba2..ac73ca7 100644
      Unit* unit = healer;
      if (healer && healer->GetTypeId() == TYPEID_UNIT && healer->IsTotem())
          unit = healer->GetOwner();
-@@ -8443,6 +8462,15 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
+@@ -8430,6 +8431,15 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
  
      SetUnitFlag(UNIT_FLAG_MOUNT);
  
@@ -1428,7 +1426,7 @@ index 43e3ba2..ac73ca7 100644
      CalculateHoverHeight();
  
      if (Player* player = ToPlayer())
-@@ -8473,6 +8501,13 @@ void Unit::Dismount()
+@@ -8460,6 +8470,13 @@ void Unit::Dismount()
      if (!IsMounted())
          return;
  
@@ -1442,7 +1440,7 @@ index 43e3ba2..ac73ca7 100644
      SetMountDisplayId(0);
      RemoveUnitFlag(UNIT_FLAG_MOUNT);
  
-@@ -11489,6 +11524,13 @@ void Unit::SetMeleeAnimKitId(uint16 animKitId)
+@@ -11459,6 +11478,13 @@ void Unit::SetMeleeAnimKitId(uint16 animKitId)
      if (attacker && !attacker->IsInMap(victim))
          attacker = nullptr;
  
@@ -1453,10 +1451,11 @@ index 43e3ba2..ac73ca7 100644
 +    Playerbot::Hooks::OnDeath(victim, attacker);
 +#endif
 +
-     // find player: owner of controlled `this` or `this` itself maybe
-     Player* player = nullptr;
-     if (attacker)
-@@ -13682,6 +13724,14 @@ void Unit::_ExitVehicle(Position const* exitPosition)
+ // find player: owner of controlled `this` or `this` itself maybe
+    Player* player = nullptr;
+    if (attacker)
+@@ -13071,5 +13113,13 @@ void Unit::_ExitVehicle(Position const* exitPosition)
+     // If the player is on mounted duel and exits the mount, he should immediatly lose the duel
      if (player && player->duel && player->duel->IsMounted)
          player->DuelComplete(DUEL_FLED);
  
@@ -1469,11 +1468,6 @@ index 43e3ba2..ac73ca7 100644
 +#endif
 +
      SetControlled(false, UNIT_STATE_ROOT);      // SMSG_MOVE_FORCE_UNROOT, ~MOVEMENTFLAG_ROOT
- 
-     AddUnitState(UNIT_STATE_MOVE);
-diff --git a/src/server/game/Entities/Unit/Unit.cpp.rej b/src/server/game/Entities/Unit/Unit.cpp.rej
-new file mode 100644
-index 0000000..e69de29
 diff --git a/src/server/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h
 index 58951339b2..7ce860e770 100644
 --- a/src/server/game/Groups/GroupMgr.h