Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x

1 files changed, 9 insertions, 13 deletions

diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index d725419ac84..eadc0958518 100755
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -458,24 +458,20 @@ void WorldSession::HandleLootMethodOpcode(WorldPacket & recv_data)
     group->SendUpdate();
 }
 
-void WorldSession::HandleLootRoll(WorldPacket &recv_data)
+void WorldSession::HandleLootRoll(WorldPacket& recvData)
 {
+    uint64 guid;
+    uint32 itemSlot;
+    uint8  rollType;
+    recvData >> guid;                  // guid of the item rolled
+    recvData >> itemSlot;
+    recvData >> rollType;              // 0: pass, 1: need, 2: greed
+
     Group* group = GetPlayer()->GetGroup();
     if (!group)
-    {
-        recv_data.rfinish();
         return;
-    }
 
-    uint64 Guid;
-    uint32 NumberOfPlayers;
-    uint8  rollType;
-    recv_data >> Guid;                                      //guid of the item rolled
-    recv_data >> NumberOfPlayers;
-    recv_data >> rollType;                                    //0: pass, 1: need, 2: greed
-
-    // everything's fine, do it
-    group->CountRollVote(GetPlayer()->GetGUID(), Guid, NumberOfPlayers, rollType);
+    group->CountRollVote(GetPlayer()->GetGUID(), guid, rollType);
 
     switch (rollType)
     {