From 959ef0878a00357b4d877c75bf93e92e64914dc8 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 19 Oct 2010 18:32:04 +0200 Subject: Core/Groups: Use the proper RemoveMethod when player leaves a group --HG-- branch : trunk --- src/server/game/Entities/Player/Player.h | 2 +- src/server/game/Server/Protocol/Handlers/GroupHandler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 42d8bc8b67d..efed19af453 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1711,7 +1711,7 @@ class Player : public Unit, public GridObject bool IsInSameRaidWith(Player const* p) const { return p == this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); } void UninviteFromGroup(); static void RemoveFromGroup(Group* group, uint64 guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT); - void RemoveFromGroup() { RemoveFromGroup(GetGroup(),GetGUID()); } + void RemoveFromGroup(RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT) { RemoveFromGroup(GetGroup(),GetGUID(), method); } void SendUpdateToOutOfRangeGroupMembers(); void SetInGuild(uint32 GuildId) { SetUInt32Value(PLAYER_GUILDID, GuildId); } diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp index cb12a9ece6b..0c93909ea1d 100755 --- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp @@ -387,7 +387,7 @@ void WorldSession::HandleGroupDisbandOpcode(WorldPacket & /*recv_data*/) // everything's fine, do it SendPartyResult(PARTY_OP_LEAVE, GetPlayer()->GetName(), ERR_PARTY_RESULT_OK); - GetPlayer()->RemoveFromGroup(); + GetPlayer()->RemoveFromGroup(GROUP_REMOVEMETHOD_LEAVE); } void WorldSession::HandleLootMethodOpcode(WorldPacket & recv_data) -- cgit v1.2.3