From 63f52ab7517e7430d7a2c1a144288ee95266dde6 Mon Sep 17 00:00:00 2001 From: Nefertumm Date: Mon, 1 Aug 2022 16:06:45 -0300 Subject: [PATCH] fix(Core): Crashfix on loot roll (#12605) --- src/server/game/Groups/Group.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index ab72656b9..4623f8ca7 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1449,7 +1449,8 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) roll->getLoot()->unlootedCount--; AllowedLooterSet looters = item->GetAllowedLooters(); Item* _item = player->StoreNewItem(dest, roll->itemid, true, item->randomPropertyId, looters); - sScriptMgr->OnGroupRollRewardItem(player, _item, _item->GetCount(), NEED, roll); + if (_item) + sScriptMgr->OnGroupRollRewardItem(player, _item, _item->GetCount(), NEED, roll); player->UpdateLootAchievements(item, roll->getLoot()); } else @@ -1518,7 +1519,8 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) roll->getLoot()->unlootedCount--; AllowedLooterSet looters = item->GetAllowedLooters(); Item* _item = player->StoreNewItem(dest, roll->itemid, true, item->randomPropertyId, looters); - sScriptMgr->OnGroupRollRewardItem(player, _item, _item->GetCount(), GREED, roll); + if (_item) + sScriptMgr->OnGroupRollRewardItem(player, _item, _item->GetCount(), GREED, roll); player->UpdateLootAchievements(item, roll->getLoot()); } else