aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2010-08-11 15:20:20 +0200
committerSpp <spp@jorge.gr>2010-08-11 15:20:20 +0200
commitf9468e7e5d13071d170b4e10a4f20689e2ae7dc3 (patch)
tree0459f57ec0e2350b28f0a5ef89ba4fdb7f1ceb95 /src/server/game/Server
parent23c4b1be25797f73e477ecf4d238f6e360b50b5b (diff)
Dungeon Finder: Add LFG support to groups
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/Protocol/Handlers/GroupHandler.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
index 26f7d81a596..8c93e11eb20 100644
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -32,7 +32,7 @@
#include "Util.h"
#include "SpellAuras.h"
#include "Vehicle.h"
-#include "LFG.h"
+#include "LFGMgr.h"
class Aura;
@@ -266,8 +266,9 @@ void WorldSession::HandleGroupDeclineOpcode(WorldPacket & /*recv_data*/)
void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recv_data)
{
uint64 guid;
+ std::string reason;
recv_data >> guid;
- recv_data.read_skip<std::string>(); // reason
+ recv_data >> reason;
//can't uninvite yourself
if (guid == GetPlayer()->GetGUID())
@@ -366,7 +367,8 @@ void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket & recv_data)
void WorldSession::HandleGroupDisbandOpcode(WorldPacket & /*recv_data*/)
{
- if (!GetPlayer()->GetGroup())
+ Group *grp = GetPlayer()->GetGroup();
+ if (!grp)
return;
if (_player->InBattleground())