From 6f8d6f5c9bc32bbe11de3377501453da1106f98a Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 12 Jan 2022 12:55:50 +0100 Subject: Core/Groups: Fixed crash in loot rolls happening when looted object despawns before roll expires Closes #27600 --- src/server/game/Groups/Group.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 4b8f97a0cb3..d9d8d8fd425 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2698,7 +2698,7 @@ void Group::SetGroupMemberFlag(ObjectGuid guid, bool apply, GroupMemberFlags fla Group::Rolls::iterator Group::GetRoll(ObjectGuid lootObjectGuid, uint8 lootListId) { for (Rolls::iterator iter = RollId.begin(); iter != RollId.end(); ++iter) - if ((**iter)->GetGUID() == lootObjectGuid && (*iter)->itemSlot == lootListId && (*iter)->isValid()) + if ((*iter)->isValid() && (**iter)->GetGUID() == lootObjectGuid && (*iter)->itemSlot == lootListId) return iter; return RollId.end(); -- cgit v1.2.3