Merge pull request AirSkyBoat#3796 from AirSkyBoat-Dev/staging

Fixed bug where healing allied mobs would claim them
TracentEden · Jul 5, 2024 · 603007b · 603007b
2 parents 21bce6a + 7507896
commit 603007b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp
@@ -5290,8 +5290,9 @@ namespace battleutils
     void ClaimMob(CBattleEntity* PDefender, CBattleEntity* PAttacker, bool passing)
     {
         TracyZoneScoped;
-
-        if (PDefender == nullptr || (PDefender && PDefender->objtype != ENTITYTYPE::TYPE_MOB)) // Do not try to claim anything but mobs (trusts, pets, players don't count)
+        if (PDefender == nullptr ||
+            (PDefender && PDefender->objtype != ENTITYTYPE::TYPE_MOB) ||                                                   // Do not try to claim anything but mobs (trusts, pets, players don't count)
+            (PDefender && PDefender->objtype == ENTITYTYPE::TYPE_MOB && PDefender->allegiance == ALLEGIANCE_TYPE::PLAYER)) // Added mobs that are in allied with player
         {
             return;
         }