From 6252bd9fa8e6f218994d4eea804723bb216f8af4 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Wed, 12 Jan 2022 15:56:48 +0100
Subject: [PATCH] Core/Groups: Fixed crash in loot rolls happening when looted
 object despawns before roll expires

---
 src/server/game/Groups/Group.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index e64cbf10a82..36e49fea0cd 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -2792,8 +2792,9 @@ Group::Rolls::iterator Group::GetRoll(ObjectGuid Guid)
 {
     Rolls::iterator iter;
     for (iter=RollId.begin(); iter != RollId.end(); ++iter)
-        if ((*iter)->itemGUID == Guid && (*iter)->isValid())
+        if ((*iter)->isValid() && (*iter)->itemGUID == Guid)
             return iter;
+
     return RollId.end();
 }