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(); }