diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 81c169be596..21e6b3cc17f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10853,8 +10853,30 @@ bool Unit::InitTamedPet(Pet* pet, uint8 level, uint32 spell_id) creature->SetLootRecipient(nullptr); } - if (isRewardAllowed && creature && creature->GetLootRecipient()) - player = creature->GetLootRecipient(); + if (isRewardAllowed && creature) + { + if (Player* lootRecipient = creature->GetLootRecipient()) + { + // Loot recipient can be in a different map + if (!creature->IsInMap(lootRecipient)) + { + if (Group* group = creature->GetLootRecipientGroup()) + { + for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) + { + Player* member = itr->GetSource(); + if (!member || !creature->IsInMap(member)) + continue; + + player = member; + break; + } + } + } + else + player = creature->GetLootRecipient(); + } + } // Exploit fix if (creature && creature->IsPet() && creature->GetOwnerGUID().IsPlayer()) |