diff options
| author | robinsch <robinsch@users.noreply.github.com> | 2016-08-14 17:26:03 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 15:11:20 +0100 |
| commit | d94f0f34277680b5c7c33797851a78450b6e4ac7 (patch) | |
| tree | 32e2246f892edcb58b508aac71e2ce9ef8662a90 /src/server/game/Groups/Group.cpp | |
| parent | a71aa14d3ed72f92cbd58bebbd224b648271c0c9 (diff) | |
Core/Spell: Remove all raid auras on party leave (#17663)
(cherry picked from commit dd67f4ed966875e6e68f6b0a8d56cdf190d0f352)
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index b6a1903da95..6b522cea06a 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -35,6 +35,7 @@ #include "Util.h" #include "LFGMgr.h" #include "UpdateFieldFlags.h" +#include "SpellAuras.h" #include "PartyPackets.h" #include "LootPackets.h" @@ -536,6 +537,22 @@ bool Group::RemoveMember(ObjectGuid guid, const RemoveMethod& method /*= GROUP_R sScriptMgr->OnGroupRemoveMember(this, guid, method, kicker, reason); + Player* player = ObjectAccessor::FindConnectedPlayer(guid); + if (player) + { + for (GroupReference* itr = GetFirstMember(); itr != nullptr; itr = itr->next()) + { + if (Player* groupMember = itr->GetSource()) + { + if (groupMember->GetGUID() == guid) + continue; + + groupMember->RemoveAllGroupBuffsFromCaster(guid); + player->RemoveAllGroupBuffsFromCaster(groupMember->GetGUID()); + } + } + } + // LFG group vote kick handled in scripts if (isLFGGroup() && method == GROUP_REMOVEMETHOD_KICK) return !m_memberSlots.empty(); @@ -543,7 +560,6 @@ bool Group::RemoveMember(ObjectGuid guid, const RemoveMethod& method /*= GROUP_R // remove member and change leader (if need) only if strong more 2 members _before_ member remove (BG/BF allow 1 member group) if (GetMembersCount() > ((isBGGroup() || isLFGGroup() || isBFGroup()) ? 1u : 2u)) { - Player* player = ObjectAccessor::FindConnectedPlayer(guid); if (player) { // Battleground group handling |