Core/Loot: Implement round robin for under threshold items in case of master loot

Thanks @Shauren for pointing out

1 files changed, 8 insertions, 22 deletions

diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
index d1b60ed07fa..f92c6e08e31 100644
--- a/src/server/game/Handlers/LootHandler.cpp
+++ b/src/server/game/Handlers/LootHandler.cpp
@@ -297,17 +297,7 @@ void WorldSession::DoLootRelease(uint64 lguid)
 
             // if the round robin player release, reset it.
             if (player->GetGUID() == loot->roundRobinPlayer)
-            {
-                if (Group* group = player->GetGroup())
-                {
-                    if (group->GetLootMethod() != MASTER_LOOT)
-                    {
-                        loot->roundRobinPlayer = 0;
-                    }
-                }
-                else
-                    loot->roundRobinPlayer = 0;
-            }
+                loot->roundRobinPlayer = 0;
         }
     }
     else if (IS_CORPSE_GUID(lguid))        // ONLY remove insignia at BG
@@ -376,19 +366,15 @@ void WorldSession::DoLootRelease(uint64 lguid)
             // if the round robin player release, reset it.
             if (player->GetGUID() == loot->roundRobinPlayer)
             {
+                loot->roundRobinPlayer = 0;
+
                 if (Group* group = player->GetGroup())
                 {
-                    if (group->GetLootMethod() != MASTER_LOOT)
-                    {
-                        loot->roundRobinPlayer = 0;
-                        group->SendLooter(creature, NULL);
-
-                        // force update of dynamic flags, otherwise other group's players still not able to loot.
-                        creature->ForceValuesUpdateAtIndex(UNIT_DYNAMIC_FLAGS);
-                    }
+                    group->SendLooter(creature, NULL);
+
+                    // force update of dynamic flags, otherwise other group's players still not able to loot.
+                    creature->ForceValuesUpdateAtIndex(UNIT_DYNAMIC_FLAGS);
                 }
-                else
-                    loot->roundRobinPlayer = 0;
             }
         }
     }
@@ -404,7 +390,7 @@ void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recvData)
 
     recvData >> lootguid >> slotid >> target_playerguid;
 
-    if (!_player->GetGroup() || _player->GetGroup()->GetLooterGuid() != _player->GetGUID() || _player->GetGroup()->GetLootMethod() != MASTER_LOOT)
+    if (!_player->GetGroup() || _player->GetGroup()->GetMasterLooterGuid() != _player->GetGUID() || _player->GetGroup()->GetLootMethod() != MASTER_LOOT)
     {
         _player->SendLootRelease(GetPlayer()->GetLootGUID());
         return;