diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Loot/Loot.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Loot/Loot.h | 1 |
4 files changed, 21 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6131c40aca0..5ec2a72d2ad 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25751,6 +25751,13 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot, AELootResult* aeResult/* return; } + // dont allow protected item to be looted by someone else + if (!item->rollWinnerGUID.IsEmpty() && item->rollWinnerGUID != GetGUID()) + { + SendLootRelease(GetLootGUID()); + return; + } + ItemPosCountVec dest; InventoryResult msg = CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, item->itemid, item->count); if (msg == EQUIP_ERR_OK) diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 184bd97e17d..7321244578c 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1283,7 +1283,8 @@ void Group::CountTheRoll(Rolls::iterator rollI) else { item->is_blocked = false; - player->SendEquipError(msg, NULL, NULL, roll->itemid); + item->rollWinnerGUID = player->GetGUID(); + player->SendEquipError(msg, nullptr, nullptr, roll->itemid); } } } @@ -1335,7 +1336,8 @@ void Group::CountTheRoll(Rolls::iterator rollI) else { item->is_blocked = false; - player->SendEquipError(msg, NULL, NULL, roll->itemid); + item->rollWinnerGUID = player->GetGUID(); + player->SendEquipError(msg, nullptr, nullptr, roll->itemid); } } else if (rollvote == DISENCHANT) @@ -1360,7 +1362,7 @@ void Group::CountTheRoll(Rolls::iterator rollI) for (uint32 i = 0; i < max_slot; ++i) { LootItem* lootItem = loot.LootItemInSlot(i, player); - player->SendEquipError(msg, NULL, NULL, lootItem->itemid); + player->SendEquipError(msg, nullptr, nullptr, lootItem->itemid); player->SendItemRetrievalMail(lootItem->itemid, lootItem->count); } } diff --git a/src/server/game/Loot/Loot.cpp b/src/server/game/Loot/Loot.cpp index 681f441ea84..e9a4e0c4757 100644 --- a/src/server/game/Loot/Loot.cpp +++ b/src/server/game/Loot/Loot.cpp @@ -55,6 +55,7 @@ LootItem::LootItem(LootStoreItem const& li) is_blocked = 0; is_underthreshold = 0; is_counted = 0; + rollWinnerGUID = ObjectGuid::Empty; canSave = true; } @@ -518,6 +519,13 @@ void Loot::BuildLootResponse(WorldPackets::Loot::LootResponse& packet, Player* v // => item is lootable slot_type = LOOT_SLOT_TYPE_ALLOW_LOOT; } + else if (!items[i].rollWinnerGUID.IsEmpty()) + { + if (items[i].rollWinnerGUID == viewer->GetGUID()) + slot_type = LOOT_SLOT_TYPE_OWNER; + else + continue; + } else // item shall not be displayed. continue; diff --git a/src/server/game/Loot/Loot.h b/src/server/game/Loot/Loot.h index a2c30e42a0c..f9da5537806 100644 --- a/src/server/game/Loot/Loot.h +++ b/src/server/game/Loot/Loot.h @@ -140,6 +140,7 @@ struct TC_GAME_API LootItem uint8 context; ConditionContainer conditions; // additional loot condition GuidSet allowedGUIDs; + ObjectGuid rollWinnerGUID; // Stores the guid of person who won loot, if his bags are full only he can see the item in loot list! uint8 count : 8; bool is_looted : 1; bool is_blocked : 1; |